diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:28:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:30:53 +0200 |
| commit | 625f40151b0767cb421999cf988f4eb7bcf8b63d (patch) | |
| tree | 629565f6f9efb26ad36b2a6d8e7e266290feb94b /pkgs/development/python-modules/httpserver | |
| parent | d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 (diff) | |
| parent | 4fb87e91ffcbf6f6785e32b7e608198401a7155d (diff) | |
Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/tools/package-management/nixops/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions