Vladimír Čunát aa8e8303e1 Merge branch 'x-updates' into master		2013-09-11 08:37:03 +02:00
..
applications	Fix Nixpkgs evaluation	2013-09-10 15:54:06 +02:00
build-support	Build aggregates locally	2013-08-21 14:50:34 +02:00
data	unmaintain several packages	2013-08-16 23:45:01 +02:00
desktops	Merge branch 'master' into x-updates	2013-09-08 12:04:20 +02:00
development	Merge branch 'x-updates' into master	2013-09-11 08:37:03 +02:00
games	beret: Fix build on darwin (close #923)	2013-09-08 10:32:25 +02:00
lib	Merge branch 'x-updates' into master	2013-09-11 08:37:03 +02:00
misc	Merge branch 'x-updates' into master	2013-09-11 08:37:03 +02:00
os-specific	Merge branch 'master' into x-updates	2013-09-07 16:19:46 +02:00
servers	Merge branch 'x-updates' into master	2013-09-11 08:37:03 +02:00
shells	zsh: Upgrade to 5.0.2	2013-09-01 16:46:21 +02:00
stdenv	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
test
tools	Merge branch 'x-updates' into master	2013-09-11 08:37:03 +02:00
top-level	Merge branch 'x-updates' into master	2013-09-11 08:37:03 +02:00