Eelco Dolstra 81628a6ccc Merge branch 'master' into make ... Conflicts: src/libexpr/eval.cc		2014-01-21 15:30:01 +01:00
..
Makefile	Update Makefiles	2014-01-09 16:53:47 +01:00
Makefile.am	When ‘--help’ is given, just run ‘man’ to show the manual page	2012-10-03 16:40:09 -04:00
nix-env.cc	Remove unused type	2014-01-21 15:11:57 +01:00
profiles.cc	Whitespace	2012-12-03 18:19:49 +01:00
profiles.hh	Use "#pragma once" to prevent repeated header file inclusion	2012-07-18 14:59:03 -04:00
user-env.cc	Add missing #include	2013-11-22 15:41:48 +00:00
user-env.hh	Use "#pragma once" to prevent repeated header file inclusion	2012-07-18 14:59:03 -04:00