Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
unichrome	Mark more packages as broken	2013-11-04 21:11:00 +01:00
builder.sh
default.nix	xorg.xf86-video-ati: update 7.2.0 -> 7.1.0	2014-01-16 14:36:42 +01:00
extra.list	X security updates	2013-06-05 21:24:19 +02:00
generate-expr-from-tarballs.pl	luit: fix build with newer gcc (close #734)	2013-07-27 19:56:22 +02:00
imake.patch
imake.sh
libpciaccess-apple.patch
old.list	X security updates	2013-06-05 21:24:19 +02:00
overrides.nix	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
replacements.nix
tarballs-7.7.list	xorg.xf86-video-ati: update 7.2.0 -> 7.1.0	2014-01-16 14:36:42 +01:00
xorgserver-xkbcomp-path.patch