Eelco Dolstra 81628a6ccc Merge branch 'master' into make ... Conflicts: src/libexpr/eval.cc		2014-01-21 15:30:01 +01:00
..
lib/Nix	Merge branch 'master' into make	2014-01-21 15:30:01 +01:00
Makefile	Update Makefiles	2014-01-09 16:53:47 +01:00
Makefile.am	Support cryptographically signed binary caches	2014-01-08 15:42:53 +01:00
MANIFEST	* Include the Nix Perl bindings in Nix itself. This will allow the	2011-10-10 18:12:40 +00:00