William A. Kennington III eb4a73af93 Merge branch 'master.upstream' into staging.upstream		2015-07-27 17:48:09 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-07-27 16:11:03 -07:00
build-support	Merge branch 'master' into staging	2015-07-26 17:57:46 +02:00
data	dejavu-fonts: don't install the fonts twice :-S	2015-07-26 17:49:31 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-07-27 16:11:03 -07:00
development	libsoup: 2.48 -> 2.50	2015-07-27 17:45:23 -07:00
games	minecraft: fix wrapper	2015-07-24 00:26:48 +02:00
misc	ghostscript: Fix after merge from master	2015-07-27 09:11:23 -07:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-07-27 16:11:03 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-07-27 17:48:09 -07:00
shells	More docs/manpages in separate outputs	2015-07-27 00:27:54 +02:00
stdenv	make libcxxStdenv work on both darwin and linux	2015-07-27 14:25:40 -07:00
test
tools	Merge pull request #8981 from sellout/patch-1	2015-07-27 15:50:54 -04:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-07-27 16:11:03 -07:00