diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-08 15:41:39 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-08 15:41:39 +0000 |
| commit | 7db886fdb96067a43d72bca30a2802ceb534fc69 (patch) | |
| tree | 376006f8f4920103aac394501d7f2682250d3da8 /pkgs/development/python-modules/rangehttpserver | |
| parent | ba6c764a519a2dbe61b0a99a95df0d8bcd8a81fa (diff) | |
| parent | 8c4a613f3a478c1cb2994fb9df3b0eb92d4c7885 (diff) | |
Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
pkgs/development/libraries/libgphoto2/default.nix
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions