diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-11-08 15:56:32 +0100 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-11-08 15:56:40 +0100 |
| commit | 83221f3886c8b74f78edbad5a1541de0837a0f24 (patch) | |
| tree | f9a53d659e562acf0637ffb42f013aebf460a947 /pkgs/development/python-modules/httpserver | |
| parent | 7f3c95e6b7d40df043652b2fca54b0997e7a1937 (diff) | |
| parent | aa2fd47e9dee4e36e4bd494601e0ae5d9b40a78f (diff) | |
Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions