Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/top-level/all-packages.nix		2013-10-26 18:28:05 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
build-support	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
data	man-pages: Update to 3.54	2013-10-23 10:36:21 +02:00
desktops
development	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
games	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
os-specific	linux: Update to 3.4.67	2013-10-24 14:52:09 +02:00
servers	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
shells
stdenv	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
test
tools	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
top-level	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00