kwin/effects
l10n daemon script dce5bc1bc0 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2016-02-09 10:37:25 +00:00
..
backgroundcontrast [effects] Support GLES 3 in Blur and BackgroundContrast 2015-11-09 16:22:32 +01:00
blur [effects] Check for LimitedNPOT 2016-02-02 12:37:14 +01:00
coverswitch [effects] Combine all shaders in resources 2016-02-01 08:42:30 +01:00
cube [effects] Remove clip plane from Cube effect 2016-02-01 08:43:25 +01:00
desktopgrid Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
diminactive Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 2015-12-09 23:42:45 +00:00
dimscreen
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-10 11:46:53 +00:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
fallapart
flipswitch Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
glide Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 2015-12-09 23:42:45 +00:00
highlightwindow
invert Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
kscreen do not reinterpret_cast insufficient data 2015-10-05 23:41:16 +02:00
login SVN_SILENT made messages (.desktop file) - always resolve ours 2015-12-30 09:40:57 +00:00
logout [effects] Check for LimitedNPOT 2016-02-02 12:37:14 +01:00
lookingglass [effects] Check for LimitedNPOT 2016-02-02 12:37:14 +01:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
magnifier Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-17 13:07:36 +00:00
minimizeanimation
mouseclick Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
mousemark Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
presentwindows Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
resize [effects] Use shader traits in Resize 2016-01-25 14:11:54 +01:00
scalein SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
screenedge [effects] Use shader traits api in screenedge effect 2016-01-25 14:11:54 +01:00
screenshot Revert "Handle conflicts between epoxy and manually resolved function pointers" 2015-11-17 14:58:59 +01:00
sheet
showfps [effects] Switch ShowFPS to ShaderTraits based rendering 2016-01-25 14:11:54 +01:00
showpaint [effects] Use shader traits in ShowPaint effect 2016-01-25 14:11:54 +01:00
slide Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
slideback explicitly update the stack track on unminimization 2015-11-24 22:38:49 +01:00
slidingpopups update expanded geometry when slide is done 2016-01-14 23:37:13 +01:00
snaphelper [effects] Use shader traits in SnapHelper effect 2016-01-25 14:11:54 +01:00
startupfeedback [effects] Combine all shaders in resources 2016-02-01 08:42:30 +01:00
thumbnailaside Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
trackmouse [effects] Use shader traits API in trackmouse 2016-01-25 14:11:54 +01:00
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-09 10:37:25 +00:00
windowgeometry Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 2015-12-09 23:42:45 +00:00
wobblywindows Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 2015-12-09 23:42:45 +00:00
zoom Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
CMakeLists.txt [effects] Combine all shaders in resources 2016-02-01 08:42:30 +01:00
effect_builtins.cpp Drop the Dashboard Effect 2015-10-19 13:56:46 +02:00
effect_builtins.h Drop the Dashboard Effect 2015-10-19 13:56:46 +02:00
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-12-06 09:17:34 +00:00
logging.cpp Change default logging category to QtCriticalMsg 2015-07-31 13:29:58 +02:00
Messages.sh
shaders.qrc [effects] Combine all shaders in resources 2016-02-01 08:42:30 +01:00