Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/misc/less/default.nix		2013-12-16 21:13:24 +01:00
..
applications	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
build-support	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
data
desktops	gnome.gvfs: update from 1.14.1 to 1.14.2	2013-12-11 09:47:45 +02:00
development	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
games	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
misc
os-specific	linux: Update to 3.4.74	2013-12-16 14:46:21 +01:00
servers	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
shells
stdenv
test
tools	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
top-level	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00