diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
| commit | 19530856ed44248c8e14cfc6533b4001318e74d1 (patch) | |
| tree | c5c03ca92fdc6af84cffa33cfd4906846013443c /pkgs/development/python-modules/rangehttpserver | |
| parent | ca67fccbfe867c7594e87b9f842dababbe3c7403 (diff) | |
| parent | 8fe0f0007bb84bafcf5f7209c12c779b24bec7f8 (diff) | |
Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions