Shea Levy 304fd16d95 Merge branch 'concurrencykit' of git://github.com/thoughtpolice/nixpkgs ... concurrencykit: version 0.4.1		2014-03-31 21:50:42 -04:00
..
applications	Merge pull request #2082 from cpages/update	2014-03-31 23:13:38 +02:00
build-support	Merge pull request #2010 from ambrop72/fetchgit-no-submodules	2014-03-26 11:11:25 +01:00
data
desktops
development	Merge branch 'concurrencykit' of git://github.com/thoughtpolice/nixpkgs	2014-03-31 21:50:42 -04:00
games	Merge pull request #2082 from cpages/update	2014-03-31 23:13:38 +02:00
misc
os-specific	Add linux 3.14	2014-03-31 20:54:47 -04:00
servers	Merge pull request #2082 from cpages/update	2014-03-31 23:13:38 +02:00
shells
stdenv
test
tools	Merge branch 'ccid' of git://github.com/ambrop72/nixpkgs	2014-03-31 21:00:15 -04:00
top-level	Merge branch 'concurrencykit' of git://github.com/thoughtpolice/nixpkgs	2014-03-31 21:50:42 -04:00