William A. Kennington III 6e698f9c61 Merge branch 'master.upstream' into staging.upstream		2015-08-09 13:34:18 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-08-09 13:34:18 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-08-07 13:40:39 -07:00
data	Font Awesome updated => 4.4.0	2015-08-09 14:17:29 +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-09 13:34:18 -07:00
games	cataclysm-dda: init at 0.C	2015-08-09 15:17:14 +02: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-09 13:34:18 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-08-09 13:34:18 -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-09 13:34:18 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-08-09 13:34:18 -07:00