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)
Merge branch 'TimothyGu-develop' into develop

1  2 
Makefile

diff --cc Makefile
Simple merge