nixpkgs/pkgs
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
..
applications Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
build-support Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
data Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
desktops Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
development Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
games Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
lib Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
misc Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
os-specific Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
servers Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
shells Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
stdenv Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
test
tools Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
top-level Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00