diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-29 00:23:54 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-29 00:23:54 -0400 |
| commit | 1aa5589eefc3c7413dce2cf6fc17a923e393f580 (patch) | |
| tree | d273b98ab345386857611c634413c8dab8629f02 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 63f97fe9db09cb8bb81d2dac85809ea949c511c5 (diff) | |
| parent | 53e743fa08623317b43c341bb17c764348fccbf4 (diff) | |
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
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions