yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/effects/dashboard
History
Martin Gräßlin 969e6b85e7 Merge branch 'master' into frameworks-scratch 
Conflicts:
	CMakeLists.txt
	kwin/client.cpp
	kwin/effects/highlightwindow/highlightwindow.cpp
	kwin/libkwineffects/kwingltexture.cpp
	kwin/libkwineffects/kwinxrenderutils.cpp
	kwin/scene_opengl.cpp
	kwin/workspace.cpp
	plasma/desktop/applets/kickoff/CMakeLists.txt
	plasma/desktop/applets/taskmanager/package/contents/code/tools.js
	plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
	plasma/desktop/applets/taskmanager/package/contents/ui/main.qml
	plasma/desktop/applets/taskmanager/package/metadata.desktop
	plasma/desktop/applets/taskmanager/plugin/textlabel.h
	plasma/desktop/applets/tasks/CMakeLists.txt
	plasma/desktop/applets/tasks/package/metadata.desktop
	plasma/desktop/applets/tasks/tasks.cpp
	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
	plasma/generic/applets/activitybar/activitybar.cpp
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-09-24 11:28:38 +02:00
..
CMakeLists.txt
dashboard.cpp Merge branch 'master' into frameworks-scratch 2013-09-24 11:28:38 +02:00
dashboard.desktop SVN_SILENT made messages (.desktop file) 2013-06-13 03:55:34 +00:00
dashboard.h Remove unused includes 2013-03-15 15:51:14 +01:00
dashboard.kcfg
dashboard_config.cpp Port effect configs to new KCModule ctor 2013-07-24 09:58:43 +02:00
dashboard_config.desktop SVN_SILENT made messages (.desktop file) 2013-06-09 03:47:41 +00:00
dashboard_config.h
dashboard_config.ui KIntSpinBox -> QSpinBox in kwin/effects configs 2013-09-09 07:38:30 +02:00
dashboardconfig.kcfgc