You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Thomas Lübking 9bf14c2653 Merge branch 'KDE/4.11'
Conflicts:
	kwin/clients/aurorae/src/aurorae.cpp
11 years ago
..
CMakeLists.txt
showfps.cpp
showfps.desktop
showfps.h
showfps.kcfg
showfps_config.cpp
showfps_config.desktop
showfps_config.h
showfps_config.ui
showfpsconfig.kcfgc