nixpkgs/pkgs
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 shared_mime_info: update from 1.1 to 1.2 2013-12-04 06:53:44 +02:00
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 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00
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 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
stdenv stdenv/patchShebangs: fix shebang check 2013-12-07 21:13:06 +01:00
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