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 75f3964db7 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 [effects] Properly announce/remove support in blur/contrast if shader fails 9 years ago
blur [effects] Properly announce/remove support in blur/contrast if shader fails 9 years ago
coverswitch
cube
desktopgrid
dialogparent
diminactive
dimscreen
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
fade SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
fallapart
flipswitch
glide Drop remaning code for ShowDashboard 9 years ago
highlightwindow
invert
kscreen do not reinterpret_cast insufficient data 9 years ago
login
logout
lookingglass
magiclamp
magnifier
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
minimizeanimation
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
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 SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
wobblywindows
zoom
CMakeLists.txt Drop the Dashboard Effect 9 years ago
Messages.sh
effect_builtins.cpp Drop the Dashboard Effect 9 years ago
effect_builtins.h Drop the Dashboard Effect 9 years ago
kwineffect.desktop
logging.cpp