William A. Kennington III 67ebbc9a78 nghttp2: 1.0.2 -> 1.1.1		2015-07-17 14:35:45 -07:00
..
applications	Merge branch 'master.upstream' into staging.next	2015-07-17 14:34:56 -07:00
build-support	Merge master into staging	2015-07-17 06:38:04 +02:00
data	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
development	nghttp2: 1.0.2 -> 1.1.1	2015-07-17 14:35:45 -07:00
games	Merge branch 'master.upstream' into staging.upstream	2015-07-13 15:11:31 -07:00
misc	FS-UAE: 2.4.1 -> 2.4.3	2015-07-15 09:35:58 -03:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
servers	Merge master into staging	2015-07-17 06:38:04 +02:00
shells	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
stdenv	make bootstrap files buildable in sandbox	2015-07-10 14:00:47 -07:00
test
tools	Merge branch 'master.upstream' into staging.next	2015-07-17 14:34:56 -07:00
top-level	Merge branch 'master.upstream' into staging.next	2015-07-17 14:34:56 -07:00