Vladimír Čunát 689d6303e8 Merge branch 'master' into staging ...

The haskell split got reverted (again).
Hydra: ?compare=1416012

2017-12-05 13:07:26 +01:00

..

applications

Merge branch 'master' into staging

2017-12-05 13:07:26 +01:00

build-support

Init Centos 7.4 vmTools diskImage

2017-12-03 11:42:34 -05:00

common-updater

…

data

Merge branch 'master' into staging

2017-12-04 15:25:34 +00:00

desktops

gnome3.dconf-editor: drop gnome3.gsettings_desktop_schemas

2017-12-04 17:32:17 +01:00

development

Merge branch 'master' into staging

2017-12-05 13:07:26 +01:00

games

cataclysm-dda-git: disable parallel building

2017-12-04 22:43:20 +00:00

misc

libretro.mame: fix parallel building

2017-11-29 11:18:14 +00:00

os-specific

darwin.Libsystem: fix build on 10.13.2

2017-12-04 18:54:39 +00:00

servers

Merge pull request #32260 from erictapen/osrm-bump

2017-12-04 23:01:01 +00:00

shells

zsh-prezto: updating "4f19700" -> "0crrj2n"

2017-12-03 14:51:36 +01:00

stdenv

Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files

2017-11-22 15:23:37 -05:00

test

…

tools

Merge branch 'master' into staging

2017-12-05 13:07:26 +01:00

top-level

Revert "Revive multiple outputs for Haskell packages."

2017-12-05 09:36:08 +01:00