Vladimír Čunát 625f40151b Merge branch 'master' into x-updates ... Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix		2013-08-02 18:30:53 +02:00
..
unichrome
builder.sh
default.nix	libXrender, libXvMC: Update	2013-06-14 14:53:36 +02:00
extra.list	X security updates	2013-06-05 21:24:19 +02:00
generate-expr-from-tarballs.pl	libXrender, libXvMC: Update	2013-06-14 14:53:36 +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 branch 'master' into x-updates	2013-08-02 18:30:53 +02:00
replacements.nix
tarballs-7.7.list	libXrender, libXvMC: Update	2013-06-14 14:53:36 +02:00
xorgserver-dri-path.patch
xorgserver-xkbcomp-path.patch
xorgserver12-CVE-1940.patch	xorg-server: fix CVE-1940	2013-04-18 12:50:26 +02:00