Fixed #374.
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 5 Jun 2014 09:01:12 +0000 (17:01 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 5 Jun 2014 09:01:44 +0000 (17:01 +0800)
commitb31ec993725bc19ebc6fdaf0fc350193f1378447
tree5fb4f74e28e7c7025e67489aaeb9b9e85b80fe7c
parent0ac073fa9415571d6d9842a30de5bd58ce1bfedb
parentced13574a0584b8c284a2d9a637bc27fea940d69
Fixed #374.

Merge branch 'TimothyGu-develop' into develop
Makefile