kwin/effects
l10n daemon script 6fb78e9d1e 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"
2018-08-16 11:04:26 +02:00
..
backgroundcontrast [effects/backgroundcontrast] Calculate correct y-coord of the copy rect 2018-05-17 02:51:50 -07:00
blur SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
colorpicker
coverswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
cube SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
desktopgrid SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
diminactive SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
dimscreen [effects/dimscreen] Use QSet for checking whether activated window asks for permissions 2018-06-09 12:27:52 +03:00
eyeonscreen [kcmkwin/compositing] Move show desktop effects to their own category 2018-08-02 16:32:57 +03:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-11 05:34:25 +02:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-11 05:34:25 +02:00
fallapart [effects/fallapart] Fade out window parts 2018-06-14 16:38:12 +03:00
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
frozenapp SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
glide [effects/glide] Don't animate the Application Dashboard 2018-08-12 09:44:45 +03:00
highlightwindow
invert SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
kscreen [effects/kscreen] Port to TimeLine 2018-07-05 23:00:27 +03:00
login SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-11 05:34:25 +02:00
logout SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-16 11:04:26 +02:00
lookingglass SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
magnifier SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
minimizeanimation [effects/minimizeanimation] Delete useless comments 2018-08-15 12:11:58 +03:00
morphingpopups SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-11 05:34:25 +02:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
mousemark [effects/mousemark] Properly use GL_LINE_SMOOTH 2018-08-09 22:52:37 +03:00
presentwindows SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
resize SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
scale SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-16 05:34:53 +02:00
screenedge
screenshot Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
sheet [effects/sheet] Modernize code 2018-08-12 11:18:37 +03:00
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
showpaint
slide SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-15 05:48:31 +02:00
slideback [effects] Ignore previous state of WindowForceBlurRole 2018-06-19 15:23:41 +03:00
slidingpopups [effects/slidingpopups] Fix coding style 2018-08-14 17:51:26 +03:00
snaphelper
startupfeedback Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
touchpoints
trackmouse SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
windowaperture [kcmkwin/compositing] Move show desktop effects to their own category 2018-08-02 16:32:57 +03:00
windowgeometry SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
wobblywindows SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
CMakeLists.txt [effects] Drop the Scale in effect 2018-08-12 10:58:07 +03:00
effect_builtins.cpp [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
effect_builtins.h [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
kwineffect.desktop
logging.cpp
Messages.sh
shaders.qrc Removed the "fastblur" path 2018-02-03 19:04:11 +01:00