William A. Kennington III c6f689f951 Merge branch 'master.upstream' into staging.upstream		2015-09-04 12:05:11 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-09-04 12:05:11 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-09-03 11:15:58 -07:00
data	geolite-legacy: update 2015-08-31 -> 2015-09-03	2015-09-03 01:17:28 +02:00
desktops	gcr: 3.14.0 -> 3.16.0, should fix race condition during build	2015-08-28 11:35:29 +02:00
development	Merge branch 'master.upstream' into staging.upstream	2015-09-04 12:05:11 -07:00
games	lgogdownloader: init at 2.24, fixes #9613	2015-09-03 13:09:06 +02:00
misc	jack2: apply patch to fix build with gcc5	2015-09-03 11:22:28 -07:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-09-04 12:05:11 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-09-04 12:05:11 -07:00
shells	bash4.3: p39 -> p42	2015-08-31 10:25:12 -07:00
stdenv	Merge branch 'master.upstream' into staging.upstream	2015-08-28 17:55:20 -07:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-09-04 12:05:11 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-09-04 12:05:11 -07:00