diff options
| author | Jonathan Glines <auntieNeo@gmail.com> | 2014-06-13 11:41:40 -0600 |
|---|---|---|
| committer | Jonathan Glines <auntieNeo@gmail.com> | 2014-06-13 11:41:40 -0600 |
| commit | c977673bb53b632f50f368b4aab69eb3d5a7f9b9 (patch) | |
| tree | 5359500092580da6fecce55a3974658db2d4c2af /pkgs/development/python-modules/httpserver | |
| parent | c55be95e6e61e9e5111b647c455759776609a34f (diff) | |
| parent | 8af05e82a024f9427b23f314cd59205126d67bb5 (diff) | |
Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen
Conflicts:
pkgs/tools/X11/nitrogen/default.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions