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 c2bc7d4d04 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"
8 years ago
..
backgroundcontrast
blur SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
colorpicker Add support for on-screen-message to kwineffects 8 years ago
coverswitch
cube Merge remote-tracking branch 'origin/Plasma/5.8' into Plasma/5.9 8 years ago
desktopgrid SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
diminactive
dimscreen
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
fade SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
fallapart
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
glide SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
highlightwindow
invert
kscreen
login
logout/data
lookingglass
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
magnifier SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
minimizeanimation
morphingpopups SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
mousemark
presentwindows
resize
scalein SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
screenedge
screenshot Add support for skip close animation to OnScreenMessage 8 years ago
sheet
showfps
showpaint
slide
slideback
slidingpopups
snaphelper
startupfeedback
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
touchpoints
trackmouse
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
windowgeometry
wobblywindows
zoom
CMakeLists.txt [effects] Add a colorpicker effect 8 years ago
Messages.sh
effect_builtins.cpp [effects] Add a colorpicker effect 8 years ago
effect_builtins.h [effects] Add a colorpicker effect 8 years ago
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
logging.cpp
shaders.qrc