nixpkgs/pkgs
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
..
applications Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
build-support Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
data linux-man-pages: Update to version 3.73. 2014-10-02 10:25:12 +02:00
desktops Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
development Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
games fix sound in minecraft for pulseaudio users 2014-10-05 19:50:35 +02:00
misc cupsBjnp: update from 1.2.1 to 1.2.2, potentially fixes CVE-2014-2856 2014-10-06 22:02:40 +02:00
os-specific Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
servers couchdb: update from 1.6.0 to 1.6.1 2014-10-06 22:03:42 +02:00
shells Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
stdenv Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
test Merge recent master into staging 2014-09-13 21:48:29 +02:00
tools Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00
top-level Merge remote-tracking branch 'origin/master' into staging 2014-10-07 00:09:37 +02:00