William A. Kennington III 8e19ac8d7c Merge branch 'master.upstream' into staging.upstream		2015-06-17 11:57:40 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
data	geolite-legacy -> 2015-06-15	2015-06-15 19:58:20 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
games	tibia: update to 10.79	2015-06-17 14:44:44 +01:00
misc	vimPlugins: 2015-06-16 update	2015-06-16 01:44:35 +03:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
shells	zsh: update from 5.0.7 to 5.0.8	2015-06-08 12:55:38 +02:00
stdenv	Don't include /no-such-path in buildInputs	2015-06-15 19:26:52 +02:00
test	…
tools	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00