Vladimír Čunát e51f73652d Merge recent master into staging ... Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)		2014-08-30 10:04:02 +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
default.nix	Merge recent master into staging	2014-08-30 10:04:02 +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	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00
imake.patch
imake.sh
libpciaccess-apple.patch
old.list	xorg: maintenance updates of a few modules	2014-05-26 22:45:50 +02:00
overrides.nix	xorg: fix typo from the last xorg commit	2014-08-24 09:55:22 +02:00
replacements.nix
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