nixpkgs/pkgs
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
..
applications Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
build-support Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
data Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
desktops vte: store patch in repo, source offline 2014-06-30 16:10:50 +02:00
development Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
games Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
misc Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
os-specific Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
servers Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
shells Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
stdenv Darwin: Use xcrun to get the path to the SDK 2014-07-01 11:01:36 +02:00
test
tools Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00
top-level Merge remote-tracking branch 'origin/master' into staging 2014-07-01 11:25:41 +02:00