kwin/effects
l10n daemon script 4578eab797 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"
2016-07-28 09:56:48 +00:00
..
backgroundcontrast respect WindowForceBlurRole or forcecontrast 2016-02-25 12:47:25 +01:00
blur respect WindowForceBlurRole or forcecontrast 2016-02-25 12:47:25 +01:00
coverswitch SVN_SILENT made messages (.desktop file) - always resolve ours 2016-06-23 23:41:42 +00:00
cube SVN_SILENT made messages (.desktop file) - always resolve ours 2016-07-25 09:56:15 +00:00
desktopgrid Revert "desktop grid: zoom hovered window" 2016-03-24 16:06:41 +01:00
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
diminactive
dimscreen
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 2016-05-31 11:06:54 +00:00
fade SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-20 09:52:01 +00:00
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
fallapart
flipswitch Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
glide
highlightwindow
invert Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
kscreen
login SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-20 09:52:01 +00:00
logout [effects] Check for LimitedNPOT 2016-02-02 12:37:14 +01:00
lookingglass [effects] Check for LimitedNPOT 2016-02-02 12:37:14 +01:00
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
magnifier Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 2016-05-31 11:06:54 +00:00
minimizeanimation
morphingpopups SVN_SILENT made messages (.desktop file) - always resolve ours 2016-07-28 09:56:48 +00:00
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-20 09:52:01 +00:00
mousemark Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
presentwindows [effects] Don't assume windowInputMouseEvents only carries QMouseEvents 2016-03-04 14:18:32 +01:00
resize
scalein SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
screenedge
screenshot
sheet
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 2016-05-31 11:06:54 +00:00
showpaint
slide Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
slideback
slidingpopups [effects/slidingpopups] Don't reference previous pixmap 2016-07-15 12:45:10 +02:00
snaphelper
startupfeedback [effects] Combine all shaders in resources 2016-02-01 08:42:30 +01:00
thumbnailaside Port to CMake AUTOMOC 2016-02-01 21:05:36 +01:00
trackmouse
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-30 09:40:55 +00:00
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-09 10:37:25 +00:00
windowgeometry
wobblywindows
zoom [effects/zoom] Remove unused variable 2016-06-29 10:51:47 +02:00
CMakeLists.txt Morphingpopups effect, to animate tooltips 2016-02-17 15:03:55 +01:00
effect_builtins.cpp
effect_builtins.h
kwineffect.desktop
logging.cpp pedantic fixes 2016-07-16 13:14:44 -04:00
Messages.sh
shaders.qrc [effects] Combine all shaders in resources 2016-02-01 08:42:30 +01:00