diff options
| author | Determinant <[email protected]> | 2015-06-25 19:56:11 +0800 |
|---|---|---|
| committer | Determinant <[email protected]> | 2015-06-25 19:56:11 +0800 |
| commit | 555f7f2e8d0578a1228cd736a35f80ba5a891817 (patch) | |
| tree | 847fd57fa2ffb4322a235ebb5fc6d9c1cf94191f /doc | |
| parent | 075fb626954da90db887cdb85bbf265b0626ddc9 (diff) | |
| parent | 46b82759d3904b08a615cf9902d053db3b4b6981 (diff) | |
Merge branch 'master' of github.com:Determinant/nerv
Conflicts:
nerv/doc/Makefile
nerv/doc/source/conf.py
nerv/doc/source/index.rst
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions