diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
| commit | 7495c61d49208a9fc90b937bca548d9005ff17c8 (patch) | |
| tree | 5eec5f802d3146b8b1f788aa1275ea1c44a24d31 /pkgs/development/python-modules/httpserver | |
| parent | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (diff) | |
| parent | 899d81b37ba6dc26431b82b40300505f19504e03 (diff) | |
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
pkgs/applications/editors/vim/macvim.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions