William A. Kennington III aaef42ab8c Merge branch 'master.upstream' into staging.upstream		2015-07-29 10:23:08 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-07-29 10:23:08 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-07-29 10:23:08 -07:00
data	docbook_xml_dtd: add version 4.4	2015-07-29 15:44:36 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-07-29 10:23:08 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-07-29 10:23:08 -07:00
games	adom: get rid of unneeded process	2015-07-28 12:58:53 +03: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-29 10:23:08 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-07-29 10:23:08 -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 branch 'master.upstream' into staging.upstream	2015-07-29 10:23:08 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-07-29 10:23:08 -07:00