Merge branch 'add_install_target' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Mon, 20 Jun 2011 10:40:05 +0000 (18:40 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Mon, 20 Jun 2011 10:40:05 +0000 (18:40 +0800)
commit2e6e9272feb72625cad268d6073ad7469cb2e077
treee2a75c0d7197a5065c5e40f09ae7f040600369ea
parent7945919f22ef9eddfcd475621259af3f01f6a09c
parentd978436c4bcc45404188d8b58618f44efd52728d
Merge branch 'add_install_target' into develop

Conflicts:
Changelog.txt
Changelog.txt