Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master ... This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix		2016-09-03 01:02:51 +03:00
..
darwin
builder.sh
darwin-imake-setup-hook.sh
default.nix
extra.list
generate-expr-from-tarballs.pl
imake-cc-wrapper-uberhack.patch
imake.patch
imake.sh
old.list
overrides.nix	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
tarballs-7.7.list
xcb-util-xrm.nix	xcb-util-xrm: Fix 'lib.optional' usage	2016-08-30 16:28:02 +03:00
xkeyboard-config-eo.patch
xorgserver-xkbcomp-path.patch
xwayland.nix