diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-26 16:46:43 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-26 16:46:43 +0200 |
| commit | 6a11ebfae93708d8156b11847d3bae6315d5cd4a (patch) | |
| tree | 0cead5fe37f5d0f9be2cf8c95710b72f9cfc7808 /pkgs/development/python-modules/httpserver | |
| parent | 18300172897169e62d6140c34f5949a7a2232375 (diff) | |
| parent | 4a2f7a73cc2bfde778194fafb8efb0c16de366bb (diff) | |
Merge remote-tracking branch 'upstream/master' into gcc-7
Conflicts:
pkgs/development/compilers/gcc/7/default.nix
pkgs/development/libraries/SDL2/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions