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)
commit74fa790354f86b9a9877309aa2c723a1364c6784
tree2dbfe4d77b137eb563abfd7eaa138f3db2bac5b7
parent756477bfe3791f13ed270d1d75ad1dfccbf83bc1
parent7b410b7f0e94edde2a606593086694ae6bb17be8
Merge branch 'develop' into hotfix-0.1alpha2.4
Makefile