Merge branch 'Plasma/5.4'
Conflicts:
CMakeLists.txt
icons/index.theme
Description
Description
Details
Details
- Committed
sitter Oct 5 2015, 1:14 PM - Parents
- R31:12d8b9a9907b: Install emotes and mimtetypes directories of the dark icon theme
R31:e0dbf4b10853: SVN_SILENT made messages (.desktop file) - always resolve ours - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 12d8b9a9907b | sitter | Install emotes and mimtetypes directories of the dark icon theme | Oct 5 2015 | |||
| 803df7211a0b | l10n daemon script | SVN_SILENT made messages (.desktop file) | Oct 4 2015 | |||
| dc7ad2e89fd1 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Oct 2 2015 | |||
| d7f99e23508c | Jonathan Riddell | Update version number for 5.4.2 GIT_SILENT | Oct 1 2015 | |||
| 5d273ab9de07 | andreas kainz | Breeze Icons: remove Marble icon cause of an trademark issue Bug: 353217 | Sep 29 2015 | |||
| 683781f81555 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Sep 28 2015 | |||
| 23389ee467de | l10n daemon script | SVN_SILENT made messages (.desktop file) | Sep 25 2015 | |||
| 109e8f7ba939 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Sep 22 2015 |
