kwin/effects
l10n daemon script cab72500b5 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-12-10 09:23:03 +01:00
..
backgroundcontrast Use nullptr everywhere 2019-09-19 17:48:21 +03:00
blur SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
colorpicker Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
coverswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
cube SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
cubeslide SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
desktopgrid SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
dialogparent/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
diminactive SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
dimscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
eyeonscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
fadingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-10 09:23:03 +01:00
fallapart Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
frozenapp/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
glide SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
highlightwindow Use nullptr everywhere 2019-09-19 17:48:21 +03:00
invert SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
kscreen Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
login/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
logout/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-17 05:29:51 +02:00
lookingglass SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
magnifier SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
maximize/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
morphingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
mousemark SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
presentwindows SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
resize SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
scale/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
screenedge Use nullptr everywhere 2019-09-19 17:48:21 +03:00
screenshot Use nullptr everywhere 2019-09-19 17:48:21 +03:00
sheet Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
showpaint SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
slide SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
slideback Use nullptr everywhere 2019-09-19 17:48:21 +03:00
slidingpopups Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
snaphelper Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
squash/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
startupfeedback [effects/startupfeedback] Fallback to small icon size when no cursor size is configured 2019-11-01 22:40:35 +01:00
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
touchpoints Use nullptr everywhere 2019-09-19 17:48:21 +03:00
trackmouse SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
translucency/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
windowaperture/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 09:26:22 +01:00
windowgeometry SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
wobblywindows SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 09:01:14 +02:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
Messages.sh Remove temporary file 2008-07-02 07:04:51 +00:00
effect_builtins.cpp [effects/screenshot] Remove outdated reference to KSnapshot 2019-06-10 08:48:19 -06:00
effect_builtins.h Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-17 05:29:51 +02:00
logging.cpp pedantic fixes 2016-07-16 13:14:44 -04:00
shaders.qrc Merge branch 'Plasma/5.12' into Plasma/5.15 2019-02-05 13:28:45 +01:00