Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/acl/default.nix pkgs/development/libraries/atk/2.6.x.nix pkgs/development/libraries/attr/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/2.34.x.nix pkgs/development/libraries/gtk+/2.24.x.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/openssl/default.nix pkgs/development/libraries/pango/1.30.x.nix pkgs/misc/cups/default.nix pkgs/os-specific/linux/util-linux/default.nix pkgs/servers/x11/xorg/builder.sh pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix		2013-06-09 00:41:27 +02:00
..
unichrome	xorg-video-unichrome: Update git url, fix build with new xorg	2012-07-15 22:40:52 -04:00
builder.sh	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02:00
default.nix	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02:00
extra.list	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
generate-expr-from-tarballs.pl	Fix font-schumacher-misc build	2012-10-15 11:52:11 -04:00
imake.patch
imake.sh	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
libpciaccess-apple.patch
old.list	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
overrides.nix	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
replacements.nix
tarballs-7.7.list	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
xorgserver-dri-path.patch	xorgserver: Update dir path patch	2012-07-14 15:03:36 -04:00
xorgserver-xkbcomp-path.patch	xorgserver: Update xkbcomp-path patch	2012-07-14 15:13:08 -04:00
xorgserver12-CVE-1940.patch	xorg-server: fix CVE-1940	2013-04-18 12:50:26 +02:00