You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script adf9cb767d 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"
6 years ago
..
backgroundcontrast [effects/backgroundcontrast] Calculate correct y-coord of the copy rect 6 years ago
blur Fix blur noise effect using incorrect scaling value 6 years ago
colorpicker
coverswitch [effects/coverswitch] Fix broken reflection on multi-monitor setup 7 years ago
cube
desktopgrid [effects/desktopgrid] Enable blur behind windows 6 years ago
dialogparent
diminactive
dimscreen
eyeonscreen
fade
fadedesktop
fallapart
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 7 years ago
frozenapp
glide
highlightwindow
invert SVN_SILENT made messages (.desktop file) - always resolve ours 7 years ago
kscreen [KScreen Effect] Fix fade to black 6 years ago
login SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
logout SVN_SILENT made messages (.desktop file) - always resolve ours 7 years ago
lookingglass
magiclamp [effects/magiclamp] Don't reset timeline 7 years ago
magnifier
maximize [effects/maximize] Enable blur behind windows 6 years ago
minimizeanimation [effects/minimizeanimation] Don't reset timeline 7 years ago
morphingpopups Merge branch 'Plasma/5.12' 6 years ago
mouseclick
mousemark
presentwindows [effects/presentwindows] Enable blur behind windows 6 years ago
resize
scalein
screenedge
screenshot
sheet
showfps
showpaint
slide SVN_SILENT made messages (.desktop file) - always resolve ours 7 years ago
slideback [effects/slideback] Enable blur behind windows 6 years ago
slidingpopups
snaphelper
startupfeedback
thumbnailaside
touchpoints
trackmouse
translucency
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 7 years ago
windowgeometry
wobblywindows
zoom Remove "move zoomed area" shortcuts by default 7 years ago
CMakeLists.txt
Messages.sh
effect_builtins.cpp [effects] replace old slide effect with a new one 7 years ago
effect_builtins.h
kwineffect.desktop
logging.cpp
shaders.qrc Removed the "fastblur" path 7 years ago