48002ab7fe
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" |
||
|---|---|---|
| .. | ||
| backgroundcontrast | ||
| blur | ||
| colorpicker | ||
| coverswitch | ||
| cube | ||
| cubeslide | ||
| desktopgrid | ||
| dialogparent | ||
| diminactive | ||
| dimscreen | ||
| eyeonscreen | ||
| fade | ||
| fadedesktop | ||
| fallapart | ||
| flipswitch | ||
| frozenapp | ||
| glide | ||
| highlightwindow | ||
| invert | ||
| kscreen | ||
| login | ||
| logout | ||
| lookingglass | ||
| magiclamp | ||
| magnifier | ||
| maximize | ||
| minimizeanimation | ||
| morphingpopups | ||
| mouseclick | ||
| mousemark | ||
| presentwindows | ||
| resize | ||
| scale | ||
| screenedge | ||
| screenshot | ||
| sheet | ||
| showfps | ||
| showpaint | ||
| slide | ||
| slideback | ||
| slidingpopups | ||
| snaphelper | ||
| startupfeedback | ||
| thumbnailaside | ||
| touchpoints | ||
| trackmouse | ||
| translucency | ||
| windowaperture | ||
| windowgeometry | ||
| wobblywindows | ||
| zoom | ||
| CMakeLists.txt | ||
| effect_builtins.cpp | ||
| effect_builtins.h | ||
| kwineffect.desktop | ||
| logging.cpp | ||
| Messages.sh | ||
| shaders.qrc | ||