kwin/effects
l10n daemon script f96f4a9fd1 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"
2015-11-29 09:02:55 +00:00
..
backgroundcontrast [effects] Support GLES 3 in Blur and BackgroundContrast 2015-11-09 16:22:32 +01:00
blur [effects] Support GLES 3 in Blur and BackgroundContrast 2015-11-09 16:22:32 +01:00
coverswitch [effects] Disable more effects while screen is locked 2015-11-26 08:30:29 +01:00
cube [effects] Disable more effects while screen is locked 2015-11-26 08:30:29 +01:00
desktopgrid [effects] Disable more effects while screen is locked 2015-11-26 08:30:29 +01:00
dialogparent SVN_SILENT made messages (.desktop file) 2015-05-23 12:49:14 +00:00
diminactive SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
dimscreen [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2015-10-25 10:45:05 +00:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-10-03 11:20:49 +00:00
fallapart [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
flipswitch [effects] Disable more effects while screen is locked 2015-11-26 08:30:29 +01:00
glide Drop remaning code for ShowDashboard 2015-10-21 08:12:01 +02:00
highlightwindow invalidate iterator on removing pointed element 2015-01-24 22:20:21 +01:00
invert [effects] Runtime checks for GLES instead of compile time checks 2015-11-03 09:29:31 +01:00
kscreen do not reinterpret_cast insufficient data 2015-10-05 23:41:16 +02:00
login SVN_SILENT made messages (.desktop file) 2015-08-31 13:32:03 +00:00
logout correctly scale and position logout window 2015-11-24 22:38:01 +01:00
lookingglass [effects] Runtime checks for GLES instead of compile time checks 2015-11-03 09:29:31 +01:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
magnifier Use shader traits for magnifer effect 2015-08-27 22:17:27 +02:00
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-17 13:07:36 +00:00
minimizeanimation [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2015-10-03 11:20:49 +00:00
mousemark [effects] Runtime checks for GLES instead of compile time checks 2015-11-03 09:29:31 +01:00
presentwindows [effects] Disable more effects while screen is locked 2015-11-26 08:30:29 +01:00
resize SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
scalein SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-07 21:21:42 +00:00
screenedge [effects] Disable more effects while screen is locked 2015-11-26 08:30:29 +01:00
screenshot Revert "Handle conflicts between epoxy and manually resolved function pointers" 2015-11-17 14:58:59 +01:00
sheet [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
showpaint [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
slide [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
slideback explicitly update the stack track on unminimization 2015-11-24 22:38:49 +01:00
slidingpopups support the slide protocol 2015-09-14 16:39:39 +02:00
snaphelper [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
startupfeedback Fix unintentional no-op, unite() doesn't change the object 2015-05-03 22:31:23 +01:00
thumbnailaside [effects] Properly set the componentDisplayName on the KActionCollection 2015-08-12 09:40:55 +02:00
trackmouse [effects] Properly set the componentDisplayName on the KActionCollection 2015-08-12 09:40:55 +02:00
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-29 09:02:55 +00:00
windowgeometry SVN_SILENT made messages (.desktop file) - always resolve ours 2015-10-03 11:20:49 +00:00
wobblywindows stall wobbling while screen is transformed 2015-05-15 23:55:28 +02:00
zoom reset generic shader after zoom 2015-11-11 22:18:39 +01:00
CMakeLists.txt Remove build checks for gles or gl 2015-11-03 09:29:37 +01:00
effect_builtins.cpp Drop the Dashboard Effect 2015-10-19 13:56:46 +02:00
effect_builtins.h Drop the Dashboard Effect 2015-10-19 13:56:46 +02:00
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
logging.cpp Change default logging category to QtCriticalMsg 2015-07-31 13:29:58 +02:00
Messages.sh Remove temporary file 2008-07-02 07:04:51 +00:00