Thomas Tuegel a8c52d0958 Merge branch 'master' into staging		2015-06-25 09:15:05 -05:00
..
applications	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
build-support	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
data	dejavu_fonts: update from 2.34 to 2.35	2015-06-22 22:42:40 +02:00
desktops	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
development	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
games	zandronum-bin: fix evaluation/tarball by assertion	2015-06-22 18:21:27 +02:00
misc	jack2: 1.9.10 -> 2015-06-02	2015-06-22 23:42:10 -07:00
os-specific	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
servers	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
shells	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
stdenv	add gnused to impure darwin stdenv	2015-06-19 22:08:01 -07:00
test
tools	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00
top-level	Merge branch 'master' into staging	2015-06-25 09:15:05 -05:00