Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/misc/emulators/wine/default.nix		2013-06-10 10:04:46 +04:00
doc	add dontBuild docs	2013-05-05 10:50:07 +02:00
maintainers	Make the location of the tarballs cache configurable	2013-06-04 12:45:12 +02:00
pkgs	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
.gitignore
COPYING
default.nix
VERSION