Eelco Dolstra f0ef6b74b9 Merge branch 'master' of github.com:thatdocslady/nix ... Conflicts: doc/manual/release-notes.xml doc/manual/writing-nix-expressions.xml		2014-09-16 14:13:36 +02:00
..
advanced-attributes.xml	Merge branch 'master' of github.com:thatdocslady/nix	2014-09-16 14:13:36 +02:00
arguments-variables.xml
build-script.xml
builder-syntax.xml
builtins.xml
custom-builder.xml
debug-build.xml
derivations.xml
expression-language.xml
expression-syntax.xml
generic-builder.xml
language-constructs.xml
language-operators.xml
language-values.xml
simple-building-testing.xml
simple-expression.xml
standard-env.xml
writing-nix-expressions.xml