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
..
data
CMakeLists.txt
cube.cpp
cube.desktop
cube.h
cube.kcfg
cube_config.cpp
cube_config.desktop
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc
cubeslide.cpp
cubeslide.desktop
cubeslide.h
cubeslide.kcfg
cubeslide_config.cpp
cubeslide_config.desktop
cubeslide_config.h
cubeslide_config.ui
cubeslideconfig.kcfgc