William A. Kennington III 38c071cdcc harfbuzz: 0.9.41 -> 1.0.1		2015-07-27 09:23:03 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-07-27 08:17:19 -07:00
build-support	Merge branch 'master' into staging	2015-07-26 17:57:46 +02:00
data	dejavu-fonts: don't install the fonts twice :-S	2015-07-26 17:49:31 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-07-27 08:17:19 -07:00
development	harfbuzz: 0.9.41 -> 1.0.1	2015-07-27 09:23:03 -07:00
games	minecraft: fix wrapper	2015-07-24 00:26:48 +02:00
misc	ghostscript: Fix after merge from master	2015-07-27 09:11:23 -07:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-07-27 08:17:19 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-07-27 08:17:19 -07:00
shells	More docs/manpages in separate outputs	2015-07-27 00:27:54 +02:00
stdenv
test
tools	colordiff: 1.0.13 -> 1.0.15	2015-07-27 01:54:08 +02:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-07-27 08:17:19 -07:00