l10n daemon script 92cf965fb1 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"		2020-09-20 10:21:05 +02:00
..
backgroundcontrast	Remove unused QLinkedList includes	2019-11-26 13:29:59 +01:00
blur	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
colorpicker	Add some const &	2019-10-30 19:23:01 +01:00
coverswitch	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
cube	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
cubeslide	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
desktopgrid	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
dialogparent/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
diminactive	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
dimscreen/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
eyeonscreen/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-25 09:53:28 +02:00
fade	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
fadedesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
fadingpopups/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
fallapart	Revert "[effects/fallapart] Override scale, fade, and glide effect"	2019-12-12 15:31:56 +02:00
flipswitch	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
frozenapp/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
glide	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
highlightwindow	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
invert	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +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	2020-06-18 09:05:32 +02:00
logout/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-20 10:21:05 +02:00
lookingglass	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-20 10:21:05 +02:00
magiclamp	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
magnifier	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
maximize/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
morphingpopups/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
mouseclick	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
mousemark	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
presentwindows	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-09 12:11:08 +02:00
resize	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
scale/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
screenedge	Add some const &	2019-10-30 19:23:01 +01:00
screenshot	Use URL with transport encryption	2019-11-26 19:39:20 +02:00
sessionquit/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-16 12:13:30 +02:00
sheet	Update my email address	2020-01-14 18:17:18 +02:00
showfps	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
showpaint	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
slide	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
slideback	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
slidingpopups	effects/slidingpopups: Properly clip windows	2020-09-01 06:15:05 +00:00
snaphelper	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
squash/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
startupfeedback	[effects/startupfeedback] Port to KConfigWatcher	2019-12-10 11:21:23 +00:00
thumbnailaside	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
touchpoints	Add some const &	2019-10-30 19:23:01 +01:00
trackmouse	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
translucency/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
windowaperture/package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
windowgeometry	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
wobblywindows	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
zoom	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 09:05:32 +02:00
CMakeLists.txt	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
Messages.sh	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01: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	2020-06-18 09:05:32 +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