yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/effects/zoom
History
Martin Gräßlin 9291b18cee Merge branch 'master' into frameworks-scratch 
Conflicts:
	CMakeLists.txt
	kwin/effects.cpp
	kwin/effects/logout/logout.cpp
	kwin/effects/presentwindows/main.qml
	kwin/effects/presentwindows/presentwindows.cpp
	kwin/effects/presentwindows/presentwindows.h
	kwin/effects/zoom/zoom_config.cpp
	kwin/libkwineffects/kwinglutils_funcs.cpp
	kwin/libkwineffects/kwinxrenderutils.cpp
	kwin/nvidiahack.cpp
	kwin/xcbutils.h
	plasma/desktop/containments/desktop/plasma-containment-desktop.desktop
	plasma/generic/wallpapers/image/image.cpp
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-08-07 10:10:06 +02:00
..
CMakeLists.txt
zoom.cpp Merge branch 'master' into frameworks-scratch 2013-08-07 10:10:06 +02:00
zoom.desktop
zoom.h
zoom.kcfg
zoom_config.cpp Merge branch 'master' into frameworks-scratch 2013-08-07 10:10:06 +02:00
zoom_config.desktop
zoom_config.h
zoom_config.ui
zoomconfig.kcfgc