Merge remote-tracking branch 'origin/Applications/17.12'
Conflicts:
CMakeLists.txt
mpyne | Dec 2 2017, 9:37 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
741957e01c7a | mpyne | Fix build when tunepimp is available. | Dec 2 2017 | |||
a936b33bf9ee | cfeck | GIT_SILENT Upgrade KDE Applications version to 17.11.90. | Nov 30 2017 | |||
507cda018d3e | aacid | GIT_SILENT Upgrade KDE Applications version to 17.11.80. | Nov 13 2017 |