kwin/effects
l10n daemon script 0aa9cb1f7a 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-03-09 05:50:43 +01:00
..
backgroundcontrast [effects] Make sure that all effects reset the streaming buffer 2019-02-15 15:51:54 +02:00
blur [effects] Make sure that all effects reset the streaming buffer 2019-02-15 15:51:54 +02:00
colorpicker Scaling support in ColorPicker effect 2017-04-28 10:23:13 +01:00
coverswitch [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
cube [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
cubeslide [effects] Move the Desktop Cube Animation effect to its own directory 2018-09-28 20:07:32 +03:00
desktopgrid Merge branch 'Plasma/5.15' 2019-02-18 16:27:45 +02:00
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +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 2019-03-08 06:00:16 +01:00
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2019-02-23 08:38:50 +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-03-07 08:45:16 +01:00
fallapart [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
flipswitch [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
frozenapp SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +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 [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
invert [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
kscreen [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
login SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
logout [effects/logout] Hide configure button in Desktop Effects KCM 2019-02-14 13:45:30 +02:00
lookingglass [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
magiclamp [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
magnifier [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01:00
morphingpopups [autotests] Test all scripted effects 2018-11-21 20:01:06 +02:00
mouseclick [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
mousemark [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
presentwindows [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
resize [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
scale SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-07 08:45:16 +01:00
screenedge Merge branch 'Plasma/5.15' 2019-02-07 02:11:14 +02:00
screenshot Merge branch 'Plasma/5.15' 2019-03-05 23:01:37 +01:00
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 2019-03-08 06:00:16 +01:00
slide Overhaul doxygen comments 2019-02-12 19:29:33 +02:00
slideback [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
slidingpopups Add windowsystem plugin for KWin's qpa 2019-01-27 08:59:58 +01: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-03-09 05:50:43 +01:00
startupfeedback Merge branch 'Plasma/5.15' 2019-02-05 13:28:56 +01:00
thumbnailaside [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
touchpoints Fix unused-parameter warnings as reported by GCC 2017-07-28 21:31:09 +02:00
trackmouse [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01:00
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01:00
windowgeometry [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
wobblywindows [effects] Port to new connect syntax 2019-01-26 01:22:06 +02:00
zoom [effects] Port to new connect syntax 2019-01-26 01:22:06 +02: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 [effects] Fix type of X-KWin-Video-Url 2018-09-11 13:46:35 +03:00
logging.cpp pedantic fixes 2016-07-16 13:14:44 -04:00
Messages.sh
shaders.qrc Merge branch 'Plasma/5.12' into Plasma/5.15 2019-02-05 13:28:45 +01:00