kwin/effects
l10n daemon script b7f6e57eff 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"
2019-01-14 05:39:00 +01:00
..
backgroundcontrast [effects/backgroundcontrast] Use override keyword 2018-10-18 19:16:17 +03:00
blur
colorpicker
coverswitch [effects/coverswitch] Use override keyword 2018-10-18 19:15:13 +03:00
cube
cubeslide
desktopgrid [wayland] add enter/leave virtual desktop API 2018-11-14 11:08:46 +00:00
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
diminactive [effects/diminactive] Dim Wayland clients 2018-10-19 14:38:10 +03:00
dimscreen SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-12 06:11:35 +01:00
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
fadedesktop [effects/fadedesktop] Rewrite it 2018-11-17 13:44:20 +02:00
fadingpopups SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-14 05:39:00 +01:00
fallapart
flipswitch
frozenapp SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
glide [effects] Add plasmashell to the blacklist of Glide and Scale effect on Wayland 2018-10-18 19:18:03 +03:00
highlightwindow
invert SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
kscreen
login SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
logout SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-07 05:29:42 +01:00
lookingglass SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-02 07:56:45 +01:00
magiclamp
magnifier
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
morphingpopups [autotests] Test all scripted effects 2018-11-21 20:01:06 +02:00
mouseclick
mousemark
presentwindows Merge branch 'Plasma/5.12' into Plasma/5.14 2018-10-29 00:02:52 +02:00
resize SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
scale SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-14 05:39:00 +01:00
screenedge
screenshot effects: attempt to screenshot on OpenGL ES 2.0 instead of failing 2018-11-11 19:03:50 +05:30
sheet [effects/sheet] Decrease the default animation duration 2018-10-22 10:11:00 +03:00
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-01 05:58:11 +01:00
showpaint SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-29 05:32:08 +01:00
slide
slideback [effects/slideback] Port away from deprecated EffectWindow::desktop 2019-01-03 16:47:28 +00:00
slidingpopups [effects/slidingpopups] Port away from deprecated EffectWindow::desktop 2019-01-03 18:12:50 +02:00
snaphelper [effects/snaphelper] Do massive overhaul 2018-11-05 16:59:19 +02:00
squash SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-14 05:39:00 +01:00
startupfeedback
thumbnailaside [effects/thumbnailaside] Save shortcuts 2018-10-27 19:09:49 +03:00
touchpoints
trackmouse
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
windowgeometry
wobblywindows SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-21 05:47:44 +01:00
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-24 05:25:01 +01:00
CMakeLists.txt [effects/dimscreen] Port to JavaScript 2018-11-17 13:44:20 +02:00
effect_builtins.cpp [effects/dimscreen] Port to JavaScript 2018-11-17 13:44:20 +02:00
effect_builtins.h [effects/dimscreen] Port to JavaScript 2018-11-17 13:44:20 +02:00
kwineffect.desktop
logging.cpp
Messages.sh
shaders.qrc