Vladimír Čunát 7e0b78f7b2 Merge master into x-updates ... Conflicts (re-created on master, preserved): pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch		2014-01-23 22:52:18 +01:00
..
unichrome	Mark more packages as broken	2013-11-04 21:11:00 +01:00
builder.sh
default.nix	Merge master into x-updates	2014-01-23 22:52:18 +01:00
extra.list	xorg: update a few sub-packages	2013-12-30 22:12:22 +01: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
overrides.nix	Merge master into x-updates	2014-01-23 22:52:18 +01:00
replacements.nix
tarballs-7.7.list	Merge master into x-updates	2014-01-23 22:52:18 +01:00
xorgserver-xkbcomp-path.patch