Commit bae47d99 by biao

Merge branch 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen

* 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen:

# Conflicts:
#	doc/DB/compass_db_schema.xlsx
parents c5fe59a2 3e9c6eed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment