William A. Kennington III 282d03befa Merge branch 'master.upstream' into staging.upstream		2015-06-22 10:57:36 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
data	geolite-legacy -> 2015-06-15	2015-06-15 19:58:20 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
games	zandronum-bin: fix evaluation/tarball by assertion	2015-06-22 18:21:27 +02:00
misc	add pkg: vbam, closes #8339	2015-06-18 11:35:43 +02:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
shells	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
stdenv	add gnused to impure darwin stdenv	2015-06-19 22:08:01 -07:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-06-22 10:57:36 -07:00