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 5cb6f51ef6 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"
4 years ago
..
backgroundcontrast
blur
colorpicker
coverswitch
cube
cubeslide
desktopgrid
dialogparent/package
diminactive
dimscreen/package
eyeonscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
fade SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
fadingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
fallapart
flipswitch SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
frozenapp/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
fullscreen/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
glide
highlightwindow
invert
kscreen
login/package
logout/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
lookingglass SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
magiclamp
magnifier
maximize/package
morphingpopups/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
mouseclick
mousemark
presentwindows
resize
scale/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
screenedge
screenshot ScreenshotEffect: fix ordering of screens in screenshotScreens 4 years ago
sessionquit/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
sheet
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
showpaint SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
slide
slideback
slidingpopups
snaphelper
squash/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
startupfeedback
thumbnailaside SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
touchpoints
trackmouse
translucency/package
windowaperture/package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
windowgeometry
wobblywindows
zoom SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
CMakeLists.txt
Messages.sh
effect_builtins.cpp
effect_builtins.h
kwineffect.desktop
logging.cpp
shaders.qrc