Eric Seidel 8e9f13e7e9 more merge fallout		2015-04-06 20:12:47 -07:00
..
applications	Merge branch master into staging	2015-04-06 18:58:08 -07:00
build-support	Merge branch master into staging	2015-04-06 18:58:08 -07:00
data	Merge branch master into staging	2015-04-06 18:58:08 -07:00
desktops	Merge branch master into staging	2015-04-06 18:58:08 -07:00
development	fix fallout from merge of master	2015-04-06 19:48:44 -07:00
games	Merge branch master into staging	2015-04-06 18:58:08 -07:00
misc	Stella: 4.2 -> 4.6	2015-04-06 12:14:29 +02:00
os-specific	Merge branch master into staging	2015-04-06 18:58:08 -07:00
servers	Merge pull request #7189 from arno01/hardenpostfix	2015-04-06 16:19:37 +02:00
shells	xonsh: new package	2015-03-26 14:25:17 -04:00
stdenv	Merge branch 'master' into staging	2015-03-27 16:03:03 -07:00
test
tools	Merge branch master into staging	2015-04-06 18:58:08 -07:00
top-level	more merge fallout	2015-04-06 20:12:47 -07:00