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	efl: remove elementary, evas and emotion, as they are integrated into efl-0.18.0	2016-08-23 11:50:45 -03:00
gnome-2	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
gnome-3	gnome3: Use dev output of nss	2016-08-30 02:41:13 +03:00
gnustep	gnustep: attempt to fix osx building	2016-08-16 21:53:45 +00:00
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	lxmenu-data: switch sf downloads to mirror://	2016-08-20 19:14:29 +05:30
mate	mate-themes: 3.20.8 -> 3.20.10	2016-08-04 08:05:50 -03:00
pantheon/apps/pantheon-terminal	pantheon-terminal: vala -> vala_0_23	2016-08-21 20:04:55 +03:00
xfce	docdev -> devdoc	2016-09-01 11:07:23 +02:00