fa8d1046ef
Conflicts: CMakeLists.txt [version number] cmake/modules/KDE4Macros.cmake [modifications to dead code] interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop [deleted] interfaces/ktexteditor/ktexteditorplugin.desktop [deleted] kparts/tests/partviewer.cpp [includes] nepomuk/core/nepomukmainmodel.cpp [deleted] nepomuk/core/resource.cpp [deleted] nepomuk/test/CMakeLists.txt [deleted] tier1/kcoreaddons/src/io/klockfile_unix.cpp [already fixed] tier1/solid/src/solid/backends/hal/halmanager.cpp [modifications to dead code, AFAICS] |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| config.ui | ||
| plasma-containmentactions-test.desktop | ||
| test.cpp | ||
| test.h | ||