Orivej Desh 3cb0103818 Merge branch 'master' into staging ... * master: libretro.mame: fix parallel building gnome3: add jtojnar as maintainer libskk: fix build gencfsm: fix build wkhtmltopdf: fix build gutenprint: fix build ghc-8.2.2: drop obsolete gold linker patch git-annex: update hash for new version 6.20171124 hackage-packages.nix: automatic Haskell package set update hackage2nix: disable failing builds hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack brotli: 0.6.0 -> 1.0.1 brotliUnstable: delete libbrotli: delete libbrotli: 1.0 -> 1.0.1.2017-10-30 nginxModules.brotli: 2015-11-18 -> 2016-12-02		2017-11-29 11:18:49 +00:00
..
applications	Merge branch 'staging'	2017-11-29 10:02:40 +01:00
build-support	Merge pull request #28448 from obsidiansystems/cc-wrapper-setup-var	2017-11-28 16:11:36 -05:00
common-updater
data	vdrsymbols: init at 20100612	2017-11-29 06:53:32 +00:00
desktops	gnome3: add jtojnar as maintainer	2017-11-29 11:46:36 +01:00
development	Merge pull request #32123 from kosta/master	2017-11-29 11:16:53 +00:00
games	solarus: enable parallel building	2017-11-27 16:14:18 +00:00
misc	libretro.mame: fix parallel building	2017-11-29 11:18:14 +00:00
os-specific	Merge branch 'staging'	2017-11-29 10:02:40 +01:00
servers	Merge pull request #32123 from kosta/master	2017-11-29 11:16:53 +00:00
shells	dgsh: fix build with glibc 2.26	2017-11-28 08:39:02 +00:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge pull request #32123 from kosta/master	2017-11-29 11:16:53 +00:00
top-level	Merge pull request #32123 from kosta/master	2017-11-29 11:16:53 +00:00