tree 497f8730e5c3eb15bdc6bb8762daae6c6e368c33
parent 48ebb29a8ec118bf6b9ee39f6be42b57321c099a
parent 58f07644eab25f68973ecab4bdc43fc318c26131
author Feng Xiao <xiaofeng@google.com> 1457727006 -0800
committer Feng Xiao <xiaofeng@google.com> 1457727006 -0800

Merge pull request #1317 from benvanik/patch-1

Fixing compilation error when building with emscripten.