William A. Kennington III fe4f8903b4 Merge branch 'master.upstream' into staging.upstream		2015-06-18 22:37:00 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-06-18 22:37:00 -07:00
build-support	Merge #8363: pure-darwin stdenv	2015-06-18 22:38:08 +02:00
data	geolite-legacy -> 2015-06-15	2015-06-15 19:58:20 +02:00
desktops	Merge #8363: pure-darwin stdenv	2015-06-18 22:38:08 +02:00
development	Merge branch 'master.upstream' into staging.upstream	2015-06-18 22:37:00 -07:00
games	add pkgs: zandronum, zandronum-{server,bin}, closes #8338	2015-06-18 11:29:03 +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-18 22:37:00 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-06-18 22:37:00 -07:00
shells	zsh: update from 5.0.7 to 5.0.8	2015-06-08 12:55:38 +02:00
stdenv	fix nonexistent cc path in bootstrap stdenv	2015-06-18 13:44:40 -07:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-06-18 22:37:00 -07:00
top-level	Merge #8363: pure-darwin stdenv	2015-06-18 22:38:08 +02:00