diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-16T12·13+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-16T12·13+0200 |
| commit | f0ef6b74b93344798e44c6dc527f88a78b75a32f (patch) | |
| tree | 8975a82b25a4410e2fc36e80cc042d74675396d7 /doc/manual/local.mk | |
| parent | 67e5dd3ce9f46f810c06e16671e98f8e56b4e25c (diff) | |
| parent | 8901acc97664aa8ebf687ee904428aa57a5192be (diff) | |
Merge branch 'master' of github.com:thatdocslady/nix
Conflicts: doc/manual/release-notes.xml doc/manual/writing-nix-expressions.xml
Diffstat (limited to 'doc/manual/local.mk')
0 files changed, 0 insertions, 0 deletions