kwin/effects
l10n daemon script f5ee562fd5 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-10-11 09:42:33 +02:00
..
backgroundcontrast effects: Disable blur and contrast effect when screen is locked 2020-09-01 06:12:01 +00:00
blur SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
colorpicker Prettify license headers 2020-08-07 19:57:56 +00:00
coverswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
cube SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
cubeslide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
desktopgrid SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
dialogparent/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
diminactive SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
dimscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
eyeonscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-10 09:49:13 +02:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
fadingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
fallapart Prettify license headers 2020-08-07 19:57:56 +00:00
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
frozenapp/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
fullscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-11 09:42:33 +02:00
glide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
highlightwindow Prettify license headers 2020-08-07 19:57:56 +00:00
invert SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
kscreen Prettify license headers 2020-08-07 19:57:56 +00:00
login/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
logout/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
lookingglass SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
magnifier SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
maximize/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
morphingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
mousemark SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
presentwindows SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
resize SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
scale/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
screenedge Prettify license headers 2020-08-07 19:57:56 +00:00
screenshot Make ScreenShotEffet::screenshotScreen return native screen sized images in Wayland case 2020-09-07 10:00:29 +02:00
sessionquit/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
sheet Prettify license headers 2020-08-07 19:57:56 +00:00
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
showpaint SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
slide SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
slideback Prettify license headers 2020-08-07 19:57:56 +00:00
slidingpopups Revert "[effects/slidingpopups] Start the animation on only windowAdded or windowClosed" 2020-09-24 11:16:57 +00:00
snaphelper Prettify license headers 2020-08-07 19:57:56 +00:00
squash/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
startupfeedback Prettify license headers 2020-08-07 19:57:56 +00:00
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-05 10:04:35 +02:00
touchpoints Prettify license headers 2020-08-07 19:57:56 +00:00
trackmouse SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
translucency/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
windowaperture/package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-10 09:49:13 +02:00
windowgeometry SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
wobblywindows SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-04 09:47:59 +02:00
CMakeLists.txt [effects/fullscreen] Add effect that animates full screen changes 2020-09-09 18:18:16 +00:00
Messages.sh Extract messages from header file as well, optimize extraction 2020-02-16 11:55:17 +02:00
effect_builtins.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
effect_builtins.h Prettify license headers 2020-08-07 19:57:56 +00:00
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-24 10:04:18 +02:00
logging.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
shaders.qrc Merge branch 'Plasma/5.12' into Plasma/5.15 2019-02-05 13:28:45 +01:00