William A. Kennington III 6aa5502129 mariadb: 10.0.20 -> 10.0.21		2015-08-07 14:19:15 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00
data	geolite-legacy: support all platforms; it's just data	2015-08-06 16:21:57 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00
games	FreeCell-Solver: init at 3.26.0	2015-08-05 22:02:13 -03:00
misc	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00
servers	mariadb: 10.0.20 -> 10.0.21	2015-08-07 14:19:15 -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-07 13:40:39 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00