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 b5b8dee854 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"
9 years ago
..
backgroundcontrast
blur
coverswitch
cube
dashboard
desktopgrid
dialogparent
diminactive
dimscreen
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
fade
fadedesktop
fallapart
flipswitch
glide
highlightwindow
invert
kscreen
login
logout
lookingglass
magiclamp
magnifier
maximize
minimizeanimation
mouseclick
mousemark
presentwindows
resize
scalein
screenedge
screenshot
sheet
showfps
showpaint
slide
slideback
slidingpopups
snaphelper
startupfeedback
thumbnailaside
trackmouse
translucency
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
windowgeometry
wobblywindows
zoom
CMakeLists.txt
Messages.sh
effect_builtins.cpp
effect_builtins.h
kwineffect.desktop
logging.cpp