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

..

command-ref.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

conf-file.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

env-common.xml

Merge branch 'master' of github.com:thatdocslady/nix

2014-09-16 14:13:36 +02:00

files.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

main-commands.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-build.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-channel.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-collect-garbage.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-copy-closure.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-daemon.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-env.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-hash.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-install-package.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-instantiate.xml

Merge branch 'master' of github.com:thatdocslady/nix

2014-09-16 14:13:36 +02:00

nix-prefetch-url.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-pull.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-push.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-shell.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

nix-store.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

opt-common-syn.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

opt-common.xml

Merge branch 'master' of github.com:thatdocslady/nix

2014-09-16 14:13:36 +02:00

opt-inst-syn.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00

utilities.xml

Restructuring the Nix manual

2014-08-27 18:41:09 +02:00