William A. Kennington III 05c0fc15c0 Merge branch 'master.upstream' into staging.upstream		2015-07-19 15:20:04 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-07-19 15:20:04 -07:00
build-support	Merge branch 'staging', discussion #8844	2015-07-19 08:09:29 +02:00
data	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
desktops	Merge branch 'staging', discussion #8844	2015-07-19 08:09:29 +02:00
development	Merge branch 'master.upstream' into staging.upstream	2015-07-19 15:20:04 -07:00
games
misc	FS-UAE: 2.4.1 -> 2.4.3	2015-07-15 09:35:58 -03:00
os-specific	pam: 1.2.0 -> 1.2.1	2015-07-19 12:22:51 -07:00
servers	xkeyboard-config: updates	2015-07-19 13:33:04 +02:00
shells	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00
stdenv
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-07-19 15:20:04 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-07-19 15:20:04 -07:00