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.
Martin Gräßlin 08b2aebd30 Merge branch 'KDE/4.7'
Conflicts:
	kwin/libkwineffects/kwinglutils.cpp
	kwin/libkwineffects/kwinglutils.h
13 years ago
..
CMakeLists.txt
Mainpage.dox
Messages.sh
kwinconfig.h.cmake
kwineffects.cpp
kwineffects.h
kwinglobals.cpp
kwinglobals.h
kwinglplatform.cpp
kwinglplatform.h
kwingltexture.cpp Merge branch 'KDE/4.7' 13 years ago
kwingltexture.h Merge branch 'KDE/4.7' 13 years ago
kwinglutils.cpp
kwinglutils.h
kwinglutils_funcs.cpp
kwinglutils_funcs.h
kwinxrenderutils.cpp
kwinxrenderutils.h