kwin/effects
l10n daemon script f4e2e0e2e9 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-04-25 10:26:32 +00:00
..
backgroundcontrast Add an internalFormat parameter to the GLTexture ctor 2014-12-30 21:19:49 +01:00
blur SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
coverswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
cube SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-12 10:31:39 +00:00
dashboard SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
desktopgrid break showingDesktop w/ tabbox/PW/DG 2015-04-07 23:59:17 +02:00
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +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-04-25 10:26:32 +00:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
fallapart [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
glide SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
highlightwindow invalidate iterator on removing pointed element 2015-01-24 22:20:21 +01:00
invert SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
kscreen don't access array to check whether ptr is nullptr 2014-11-27 20:01:10 +01:00
login SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
logout do not query GLPlatform if not GL compositing 2015-01-24 22:20:37 +01:00
lookingglass SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
magnifier SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-24 09:53:59 +00:00
minimizeanimation [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
mouseclick Add disambiguation context 2015-04-17 15:56:58 +03:00
mousemark SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
presentwindows break showingDesktop w/ tabbox/PW/DG 2015-04-07 23:59:17 +02: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-04-07 13:20:00 +00:00
screenedge [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
screenshot Add an internalFormat parameter to the GLTexture ctor 2014-12-30 21:19:49 +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 [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
slidingpopups [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
snaphelper [effects] Drop the .desktop files for the BuiltIn Effects 2014-04-28 13:52:43 +02:00
startupfeedback Use new ctors for KXMessages and KSelectionOwner 2015-03-17 10:20:19 +01:00
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
trackmouse SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00: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-04-25 10:26:32 +00:00
windowgeometry Remove unused #include <KWindowSystem> 2015-02-17 13:35:30 +01:00
wobblywindows SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
CMakeLists.txt add eye On Screen effect for showing desktop 2015-04-07 23:59:18 +02:00
effect_builtins.cpp [effects] Support building the effect_builtins without need to link the lib 2015-01-29 11:44:47 +01:00
effect_builtins.h Fix compilation with gcc-4.9 2014-04-29 07:49:54 +02:00
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
logging.cpp Changed debug statements in kwin/effects from qDebug() to qCDebug(KWINEFFECTS) 2013-11-29 08:47:56 +01:00
Messages.sh