Martin Gräßlin 97fb722757 Merge branch 'KDE/4.9' ... Conflicts: kwin/tabbox/tests/CMakeLists.txt		2012-08-02 10:53:00 +02:00
..
CMakeLists.txt
detectwidget.cpp
detectwidget.h
detectwidget.ui
editshortcut.ui
kcm.cpp
kcm.h
kwinrules.desktop
kwinsrc.cpp
main.cpp
Messages.sh
ruleslist.cpp
ruleslist.h
ruleslist.ui
ruleswidget.cpp
ruleswidget.h
ruleswidgetbase.ui
yesnobox.h