fix tricky regression noticed by Vyacheslav Tokarev on Google Reader.
[kdelibs.git] / CONFLICTS
blob6e0bd97982b93594266f348a85b939080978e1dc
1 List of remaining conflicts between kdelibs3 and kdelibs4
3 NONE!
5 List of solved conflicts:
7 bin/ktradertest            -> kdebase/runtime/ktraderclient
8                               Note that kdebase/runtime will be installed as well, so it can't conflict with kdelibs3 either.
9 bin/kde-menu               -> user tool (debugging, scripts, GUI feedback after install) -> kdebase/runtime/kde-menu, as kde4-menu.
10 bin/kstartupconfig         -> kdebase/workspace
11 bin/kdostartupconfig         -> kdebase/workspace
13 bin/kded                   -> kded4 - DONE
14 bin/kcookiejar             -> kcookiejar4 - DONE (not used by khtml anymore, only a command-line tool)
16 bin/kdesu_stub             -> libexec - DONE
17 bin/kaddprinterwizard      -> libexec - DONE (started by a kicker menuext; wrapper around libkdeprint functionality)
18 bin/kio_http_cache_cleaner -> libexec - DONE
19 bin/kdontchangethehostname -> libexec - DONE
20 bin/klauncher              -> libexec - DONE
21 bin/kpac_dhcp_helper       -> libexec - DONE
22 bin/ksendbugmail           -> libexec - DONE
23 bin/kconf_update           -> libexec - DONE (started by kded)
25 bin/cupsdoprint            -> libexec - DONE
26 bin/ksvgtopng              -> devel only, doesn't matter
27 bin/kunittestmodrunner     -> devel only, and for compat so it can't be renamed/moved
28 bin/makekdewidgets         -> devel only, doesn't matter
29 bin/kconfig_compiler       -> devel only, doesn't matter
30 bin/preparetips            -> devel only perhaps?