Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ... Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix		2013-06-08 15:41:39 +00:00
..
applications	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
build-support	fetchsvn: Allow setting the name of the output	2013-05-26 11:58:01 -04:00
data	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
desktops	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
development	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
games	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
lib	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
misc	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
os-specific	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
servers	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv	mkDerivation: Allow direct access to passthru	2013-05-03 09:07:42 -04:00
test
tools	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
top-level	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00