diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /khelpcenter/plugins | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter/plugins')
| -rw-r--r-- | khelpcenter/plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | khelpcenter/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | khelpcenter/plugins/tdeioslaves.desktop (renamed from khelpcenter/plugins/kioslaves.desktop) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/khelpcenter/plugins/CMakeLists.txt b/khelpcenter/plugins/CMakeLists.txt index cbda88d75..fea32db40 100644 --- a/khelpcenter/plugins/CMakeLists.txt +++ b/khelpcenter/plugins/CMakeLists.txt @@ -18,5 +18,5 @@ install( FILES applets.desktop contact.desktop faq.desktop info.desktop links.desktop support.desktop userguide.desktop welcome.desktop hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop - kioslaves.desktop quickstart.desktop visualdict.desktop + tdeioslaves.desktop quickstart.desktop visualdict.desktop DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins ) diff --git a/khelpcenter/plugins/Makefile.am b/khelpcenter/plugins/Makefile.am index c5dca33bb..c5601db13 100644 --- a/khelpcenter/plugins/Makefile.am +++ b/khelpcenter/plugins/Makefile.am @@ -5,6 +5,6 @@ SUBDIRS = Applications Manpages Scrollkeeper plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \ links.desktop support.desktop userguide.desktop welcome.desktop \ kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \ - kioslaves.desktop quickstart.desktop visualdict.desktop + tdeioslaves.desktop quickstart.desktop visualdict.desktop plugindir = $(kde_datadir)/khelpcenter/plugins diff --git a/khelpcenter/plugins/kioslaves.desktop b/khelpcenter/plugins/tdeioslaves.desktop index 3535ebfd1..619b0488c 100644 --- a/khelpcenter/plugins/kioslaves.desktop +++ b/khelpcenter/plugins/tdeioslaves.desktop @@ -32,4 +32,4 @@ Icon=contents2 X-DOC-Weight=-400 -X-TDE-KHelpcenter-Special=kioslave +X-TDE-KHelpcenter-Special=tdeioslave |