diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
| commit | 52404a868ddc6665da66f54dab5f102908843784 (patch) | |
| tree | da856ff0f583e67a7a209d8d75826f796df5a3bb /pkgs/development/python-modules/httpserver | |
| parent | c0e2aceef46033e43ab8b4f6aa0b36b25ba35f3d (diff) | |
| parent | 8e02bde1a8ea913ecaa4801898057968412efa01 (diff) | |
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f82be3
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions