Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs ... Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix		2014-08-23 16:04:53 +02:00
..
darwin	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00
unichrome
builder.sh
default.nix	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +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	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00
replacements.nix
tarballs-7.7.list	xorg: update probably unused modules	2014-08-21 15:13:22 +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