diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-29 09:15:53 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-29 09:15:53 +0000 |
| commit | 6c6fb4f6ce0cf49dff404c1f610781a6c9a89794 (patch) | |
| tree | 8cb8cd3d1b3aaa6fa14a2410f288f3292293dd29 /pkgs/development/python-modules/httpserver | |
| parent | 5efca65f24e7f8edf2becdb240d4795fb11e1924 (diff) | |
| parent | a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e (diff) | |
Merge branch 'master' into staging
* master: (32 commits)
qt4: fix parallel building of moc_qtgradientviewdialog.o
qt4: enable parallel building in the configure phase
aseprite-unfree: 1.2.2 -> 1.2.4
peek: disable on darwin, add optional dependencies
vdrsymbols: init at 20100612
xorg.bitmap: provide resource search path
xorg.bitmap: init at 1.0.8
firefox-devedition-bin: 58.0b7 -> 58.0b7
firefox-beta-bin: 58.0b7 -> 58.0b7
lua-mpack: fix darwin build
lua5_1: provide version
libmpack: fix darwin build
libamqpcpp: init at 2.7.4
nano: fix darwin build
gnome3.gnome-software: enable parallel building
dbus-broker: 3 -> 8
nix-exec: mark as broken
peek: init at 1.2.0
gnucash: use nativeBuildInputs
gnucash: 2.6.12 -> 2.6.18-1
...
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions