Merge branch 'master' into staging

Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
parent 291eac9d70 76c146c990
commit f29000b002
148 changed files with 5649 additions and 6475 deletions
@@ -83,7 +83,8 @@ mkDerivation rec {
    qtsvg
    qtwebkit

-    kcalcore
+    # https://bugs.kde.org/show_bug.cgi?id=387960
+    #kcalcore
    kconfigwidgets
    kcoreaddons
    kfilemetadata