William A. Kennington III 793cbaedf4 cmake: 3.2.2 -> 3.3.0		2015-08-06 10:15:04 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-08-05 16:24:57 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-08-04 15:32:43 -07:00
data	geolite-legacy: 2015-08-03 -> 2015-08-05	2015-08-05 12:17:12 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-08-05 16:24:57 -07:00
development	cmake: 3.2.2 -> 3.3.0	2015-08-06 10:15:04 -07:00
games	minecraft-server: 1.8.1 -> 1.8.8	2015-07-31 21:20:19 +03:00
misc	Merge branch 'master.upstream' into staging.upstream	2015-08-04 15:32:43 -07:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-08-04 15:32:43 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-08-05 16:24:57 -07:00
shells	Merge branch 'master.upstream' into staging.upstream	2015-08-05 16:24:57 -07:00
stdenv	Force Nixpkgs rebuild	2015-08-03 20:03:11 +02:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-08-05 16:24:57 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-08-05 16:24:57 -07:00