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	Remove no longer (or never) referenced patches	2016-01-24 02:02:21 +01:00
builder.sh	xorg.*: disable relro/bindnow hardening	2016-08-14 09:01:55 +00:00
darwin-imake-setup-hook.sh
default.nix	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
extra.list	Adding intel-gpu-tools to xorg.	2016-07-20 12:33:24 +02:00
generate-expr-from-tarballs.pl	xorg: add meta.platforms	2015-12-30 12:50:54 +01:00
imake-cc-wrapper-uberhack.patch
imake.patch
imake.sh
old.list	xorg.xorgcffiles: update 1.0.5 -> 1.0.6 (probably unused)	2016-01-04 11:58:30 +01:00
overrides.nix	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
tarballs-7.7.list	xorg xf86-video-amdgpu: init at 1.1.0	2016-08-21 11:32:26 +02:00
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