William A. Kennington III 7735c6cb0e Merge branch 'master.upstream' into staging.upstream		2015-08-31 10:28:18 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-08-31 10:28:18 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-08-28 17:55:20 -07:00
data	geolite-legacy: update 2015-08-24 -> 2015-08-31	2015-08-31 17:17:33 +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-08-31 10:28:18 -07:00
games	wesnoth: 1.10.7 -> 1.12.4	2015-08-30 05:36:17 +03:00
misc	xlockmore: clean configure flags and add Xinerama and DPMS support	2015-08-31 16:35:26 +02:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-08-31 10:28:18 -07:00
servers	nixpkgs: openresty 1.7.10.1 -> 1.9.3.1	2015-08-31 03:18:13 -05: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-08-31 10:28:18 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-08-31 10:28:18 -07:00