You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Martin Klapetek
c0b4655bba
Merge branch 'Plasma/5.2'
Conflicts:
CMakeLists.txt
applets/batterymonitor/package/metadata.desktop
applets/clipboard/metadata.desktop
klipper/plasma-dataengine-clipboard.desktop
ksmserver/screenlocker/kcm/package/metadata.desktop
lookandfeel/metadata.desktop
plasma-windowed/plasma-windowed.desktop
shell/packageplugins/layouttemplate/plasma-packagestructure-
layouttemplate.desktop
shell/packageplugins/qmlWallpaper/plasma-packagestructure-
wallpaper.desktop
shell/packageplugins/shell/plasma-packagestructure-plasma-
shell.desktop
shell/packageplugins/wallpaperimages/plasma-packagestructure-
wallpaperimages.desktop
|
11 years ago |
| .. |
|
contents
|
Merge branch 'Plasma/5.2'
|
11 years ago |
|
platformcontents
|
simplify
|
11 years ago |
|
metadata.desktop
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
