William A. Kennington III 1dab05033f Merge branch 'master.upstream' into staging.upstream		2015-08-01 19:18:08 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-08-01 19:18:08 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-07-30 15:03:10 -07:00
data	Fix random ugliness	2015-07-31 01:36:41 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-07-31 17:26:20 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-08-01 19:18:08 -07:00
games	minecraft-server: 1.8.1 -> 1.8.8	2015-07-31 21:20:19 +03:00
misc	Merge branch 'master.upstream' into staging.upstream	2015-07-31 17:26:20 -07:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-07-31 17:26:20 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-07-31 17:26:20 -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-08-01 19:18:08 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-08-01 19:18:08 -07:00