diff options
| author | Domen Kožar <domen@dev.si> | 2015-05-11 10:05:23 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-11 10:05:23 +0200 |
| commit | bb4d658f646df61285d5b05ce0b407b7795f9045 (patch) | |
| tree | db55b600f0bbb1136f22dad0a34041a49fdd37ca /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | b7f15c43da7822f0def11b0cf1afbf4f45707204 (diff) | |
| parent | c3bdabca737c50b13b9db71476fdf1dc7e853b5b (diff) | |
Merge branch 'master' into staging
Conflicts:
nixos/doc/manual/release-notes/rl-unstable.xml
nixos/modules/services/printing/cupsd.nix
pkgs/applications/misc/calibre/default.nix
pkgs/development/haskell-modules/hackage-packages.nix
pkgs/development/libraries/libsodium/default.nix
pkgs/misc/emulators/wine/unstable.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions