Luo Tao 740ee40f90 Merge branch 'develop' into dir		8 years ago
..
index_cn.md	add doc/index_cn.md	8 years ago
index_en.rst	fix conflict, move doc/conf.py.in to doc/templates	8 years ago