Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular ... Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix		2014-08-31 12:23:18 +02:00
..
darwin	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00
unichrome	Mark more packages as broken	2013-11-04 21:11:00 +01:00
builder.sh	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02:00
default.nix	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
extra.list	xorg.xcb (lib+proto): update (seems mainly bug fixes)	2014-08-21 15:13:21 +02:00
generate-expr-from-tarballs.pl	xorg: go back to using the new nix syntax	2014-08-31 12:20:34 +02:00
imake.patch
imake.sh	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
libpciaccess-apple.patch	Get libpciaccess to compile on darwin	2011-08-29 18:58:59 +00:00
old.list	xorg: maintenance updates of a few modules	2014-05-26 22:45:50 +02:00
overrides.nix	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
replacements.nix	* composedArgsAndFun -> makeOverridable for consistency.	2010-07-29 08:21:21 +00:00
tarballs-7.7.list	Merge recent master into staging	2014-08-30 10:04:02 +02:00
xf86-video-intel-testing.nix	xorg: maintenance updates of several modules	2014-06-17 09:00:29 +02:00
xkeyboard-config-eo.patch	Bringing back the xkeyboard-config eo patch	2014-03-24 10:42:00 +01:00
xorgserver-xkbcomp-path.patch	xorgserver: Update xkbcomp-path patch	2012-07-14 15:13:08 -04:00