Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master ... This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix		2016-09-03 01:02:51 +03:00
..
enlightenment
gnome-2
gnome-3	gnome3: Use dev output of nss	2016-08-30 02:41:13 +03:00
gnustep
kde-4.14	ilmbase: Use separate outputs	2016-09-01 18:57:43 +02:00
kde-5	ilmbase: Use separate outputs	2016-09-01 18:57:43 +02:00
lxde/core
mate
pantheon/apps/pantheon-terminal
xfce	docdev -> devdoc	2016-09-01 11:07:23 +02:00