kwin/effects
l10n daemon script 3836e04881 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"
2017-03-22 05:00:58 +01:00
..
backgroundcontrast
blur SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
colorpicker Add support for on-screen-message to kwineffects 2016-12-24 09:56:48 +01:00
coverswitch
cube Merge remote-tracking branch 'origin/Plasma/5.8' into Plasma/5.9 2017-01-21 00:17:14 +01:00
desktopgrid SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-20 07:43:31 +01:00
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
diminactive
dimscreen
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-22 05:00:58 +01:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-20 07:43:31 +01:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
fallapart
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 05:42:59 +01:00
glide SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 05:42:59 +01:00
highlightwindow
invert
kscreen
login
logout/data
lookingglass
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
magnifier SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
minimizeanimation
morphingpopups SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-07 14:39:25 +01:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
mousemark
presentwindows
resize
scalein SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
screenedge
screenshot Add support for skip close animation to OnScreenMessage 2017-01-25 13:54:34 +01:00
sheet
showfps
showpaint
slide
slideback
slidingpopups [effects] Introduce kcfg for SlidingPopups 2016-11-16 13:05:02 +01:00
snaphelper
startupfeedback
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-25 06:39:44 +01:00
touchpoints
trackmouse
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-07 06:37:50 +01:00
windowgeometry
wobblywindows
zoom
CMakeLists.txt [effects] Add a colorpicker effect 2016-11-25 09:30:34 +01:00
effect_builtins.cpp [effects] Add a colorpicker effect 2016-11-25 09:30:34 +01:00
effect_builtins.h [effects] Add a colorpicker effect 2016-11-25 09:30:34 +01:00
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
logging.cpp
Messages.sh
shaders.qrc