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 866dfb4e89 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	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
colorpicker	…
coverswitch	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
cube	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
cubeslide	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
desktopgrid	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
dialogparent/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
diminactive	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
dimscreen/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
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	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
highlightwindow	…
invert	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
kscreen	…
login/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
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	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
magnifier	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
maximize/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
morphingpopups/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
mouseclick	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
mousemark	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
presentwindows	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
resize	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
scale/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
screenedge	…
screenshot	…
sessionquit/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
sheet	…
showfps	…
showpaint	…
slide	…
slideback	…
slidingpopups	…
snaphelper	…
squash/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
startupfeedback	…
thumbnailaside	…
touchpoints	…
trackmouse	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
translucency/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
windowaperture/package	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
windowgeometry	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
wobblywindows	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
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	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago
logging.cpp	…
shaders.qrc	…