Shea Levy 1aa5589eef Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs ... Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6 and Oracle VM VirtualBox Extension Pack to 91406 Conflicts due to minor upgrade in the mean time Conflicts: nixos/modules/virtualisation/virtualbox-guest.nix pkgs/applications/virtualization/virtualbox/default.nix pkgs/applications/virtualization/virtualbox/guest-additions/default.nix		2014-03-29 00:23:54 -04:00
..
applications	Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs	2014-03-29 00:23:54 -04:00
build-support	Merge pull request #2010 from ambrop72/fetchgit-no-submodules	2014-03-26 11:11:25 +01:00
data
desktops
development	Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs	2014-03-28 23:25:25 -04:00
games	Merge branch 'master' of git://github.com/fmap/nixpkgs	2014-03-28 23:09:25 -04:00
misc
os-specific	Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs	2014-03-28 23:39:01 -04:00
servers	Merge branch 'shellinabox-fix' of git://github.com/grwlf/nixpkgs	2014-03-28 21:38:30 -04:00
shells
stdenv
test
tools	Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs	2014-03-28 23:45:00 -04:00
top-level	Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs	2014-03-28 23:54:43 -04:00