kwin/effects
l10n daemon script b5392802c2 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-03-03 06:17:10 +01:00
..
backgroundcontrast Remove unused QLinkedList includes 2019-11-26 13:29:59 +01:00
blur [effects] Remove unneeded link to KService 2019-11-26 17:30:04 +01:00
colorpicker Add some const & 2019-10-30 19:23:01 +01:00
coverswitch [effects] Remove unneeded link to KService 2019-11-26 17:30:04 +01:00
cube [effects] Remove unneeded link to KService 2019-11-26 17:30:04 +01:00
cubeslide [effects] Remove unneeded link to KService 2019-11-26 17:30:04 +01:00
desktopgrid [effects/desktopgrid] Use windowFrameGeometryChanged 2020-02-12 10:52:26 +02:00
dialogparent/package Update my email address 2020-01-14 18:17:18 +02:00
diminactive Update my email address 2020-01-14 18:17:18 +02:00
dimscreen/package Update my email address 2020-01-14 18:17:18 +02:00
eyeonscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-03 06:17:10 +01:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 05:49:05 +01:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-29 09:28:27 +01:00
fadingpopups/package Update my email address 2020-01-14 18:17:18 +02:00
fallapart Revert "[effects/fallapart] Override scale, fade, and glide effect" 2019-12-12 15:31:56 +02:00
flipswitch [effects/flipswitch] Add a const ref 2020-01-14 18:46:10 +02:00
frozenapp/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-21 09:42:45 +01:00
glide Update my email address 2020-01-14 18:17:18 +02:00
highlightwindow Use nullptr everywhere 2019-09-19 17:48:21 +03:00
invert [effects] Port from deprecated method KCModule::changed 2020-01-24 01:18:48 +00: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-02-11 05:59:16 +01:00
logout/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00
lookingglass [effects] Port from deprecated method KCModule::changed 2020-01-24 01:18:48 +00:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00
magnifier [effects] Port from deprecated method KCModule::changed 2020-01-24 01:18:48 +00:00
maximize/package [effects/maximize] Use windowFrameGeometryChanged 2020-02-12 10:52:26 +02:00
morphingpopups/package [effects/morphingpopups] Start animation on windowFrameGeometryChanged 2020-02-12 10:52:26 +02:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00
mousemark [effects] Remove unneeded link to KService 2019-11-26 17:30:04 +01:00
presentwindows Merge branch 'Plasma/5.18' 2020-02-14 01:50:48 +02:00
resize SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00
scale/package Update my email address 2020-01-14 18:17:18 +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-02-16 10:09:35 +01:00
sheet Update my email address 2020-01-14 18:17:18 +02:00
showfps [effects] Remove unneeded link to KService 2019-11-26 17:30:04 +01:00
showpaint [effects] Port from deprecated method KCModule::changed 2020-01-24 01:18:48 +00:00
slide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-31 05:53:55 +01:00
slideback Use nullptr everywhere 2019-09-19 17:48:21 +03:00
slidingpopups Update my email address 2020-01-14 18:17:18 +02:00
snaphelper [effects/snaphelper] Use windowFrameGeometryChanged 2020-02-12 10:52:26 +02:00
squash/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-17 10:30:32 +01:00
startupfeedback Port away from deprecated KIconLoader::IconSize 2020-02-29 00:29:13 +01:00
thumbnailaside [effects/thumbnailaside] Use windowFrameGeometryChanged 2020-02-12 10:52:26 +02:00
touchpoints Add some const & 2019-10-30 19:23:01 +01:00
trackmouse Update my email address 2020-01-14 18:17:18 +02:00
translucency/package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-03 05:49:05 +01:00
windowaperture/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-03 06:17:10 +01:00
windowgeometry [effects] Port from deprecated method KCModule::changed 2020-01-24 01:18:48 +00:00
wobblywindows SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00
CMakeLists.txt Port away from deprecated KIconLoader::IconSize 2020-02-29 00:29:13 +01:00
Messages.sh Extract messages from header file as well, optimize extraction 2020-02-16 11:55:17 +02:00
effect_builtins.cpp Remove the "Candy" category and fold its contents into "Appearance" 2020-02-25 11:26:27 -07: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