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
..
quartz-wm	Merge branch 'master.upstream' into staging.upstream	2015-10-30 17:16:07 -07:00
xorg	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
xquartz	treewide: stop using fontbhttf	2016-08-29 22:28:50 +02:00