Merge branch 'master' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:48:21 +0000 (20:48 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:48:21 +0000 (20:48 -0400)
commit9b987badb069a95256f2627144645ce5c1f5a7d0
tree793b9110938d80f961e913d6bc7698a4ab1abbb5
parentd7a1a7ff2afcf8120e181bddc2524280b22684c3
parent1619b2f3c835e9a2aff2c7ad4bb5757dade9488c
Merge branch 'master' into develop
Bump to 0.2.18.dev

Conflicts:
CMakeLists.txt
Makefile.rule
CMakeLists.txt
Makefile.rule