Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +01:00
..
unichrome	Mark more packages as broken	2013-11-04 21:11:00 +01:00
builder.sh
default.nix	libXtst: forgotten security update	2013-12-23 18:24:24 +01:00
extra.list
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
overrides.nix	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
replacements.nix
tarballs-7.7.list	libXtst: forgotten security update	2013-12-23 18:24:24 +01:00
xorgserver-xkbcomp-path.patch