Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-05-30 19:39:34 +00:00
..
altcoins	boost: Kill unnecessary 'lib' output	2016-04-28 00:41:28 +03:00
audio	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
backup	rename iElectric to domenkozar to match GitHub	2016-05-17 13:00:47 +01:00
display-managers	treewide: Make explicit that 'dev' output of freetype is used	2016-05-19 10:00:34 +02:00
editors	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
gis
graphics	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
inferno
misc	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
networking	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
office	Merge pull request #15821 from jerith666/timetrap	2016-05-30 18:27:20 +02:00
science	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
search	add get* helper functions and mass-replace manual outputs search with them	2016-04-25 13:24:39 +03:00
taxes
version-management	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
video	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
virtualization	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
window-managers	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00