nixpkgs/pkgs
Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
..
applications Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-23 10:59:44 +02:00
build-support Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
data
desktops pkgs/desktops/gnome-2/desktop/libgweather: remove dubious assertion 2013-09-15 21:36:18 +02:00
development Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-23 10:59:44 +02:00
games Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-23 10:59:44 +02:00
lib Darwin support for Go 1.1 (close #952) 2013-09-14 15:13:26 +02:00
misc Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
os-specific One more lvm2 systemd part working. 2013-09-20 11:45:50 +02:00
servers Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-23 10:59:44 +02:00
shells Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
stdenv
test
tools Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-23 10:59:44 +02:00
top-level Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-23 10:59:44 +02:00