Merge branch 'develop' into hotfix-0.1alpha2.4
authorXianyi <xianyi@iscas.ac.cn>
Fri, 16 Sep 2011 23:32:10 +0000 (07:32 +0800)
committerXianyi <xianyi@iscas.ac.cn>
Fri, 16 Sep 2011 23:32:10 +0000 (07:32 +0800)
1  2 
Makefile

diff --cc Makefile
Simple merge