kwin/effects
l10n daemon script 4e7394457c 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-04-22 11:03:45 +02: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 Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01: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-02-21 09:42:45 +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 Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
kscreen Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
login/package Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
logout/package Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
lookingglass Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
magiclamp Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
magnifier Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
maximize/package Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
morphingpopups/package Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
mouseclick Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
mousemark [effects] Remove unneeded link to KService 2019-11-26 17:30:04 +01:00
presentwindows Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
resize Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +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 SVN_SILENT made messages (.desktop file) - always resolve ours 2020-04-22 11:03:45 +02:00
slide Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +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 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-01-17 10:30:32 +01:00
startupfeedback [effects/startupfeedback] Port to KConfigWatcher 2019-12-10 11:21:23 +00:00
thumbnailaside Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01: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 Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
windowgeometry Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
wobblywindows Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
zoom Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
CMakeLists.txt Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
effect_builtins.cpp
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
Messages.sh Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
shaders.qrc