diff options
| author | Bill Welden <bwelden@imvu.com> | 2013-02-05 13:25:32 -0800 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:23:57 +0300 |
| commit | 51dfc764bd72ef54b00617e6dcedf017f52a53d0 (patch) | |
| tree | 8ed691fec0b1d2e61f5782efb63332985ab84f83 /system/lib | |
| parent | 771ee9e921504e77fe1750173e38c35857a3f016 (diff) | |
Fix a couple of merge issues bringing down the lastest emscripten.
Diffstat (limited to 'system/lib')
| -rwxr-xr-x | system/lib/embind/bind.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp index 39ee02be..705cc4db 100755 --- a/system/lib/embind/bind.cpp +++ b/system/lib/embind/bind.cpp @@ -241,5 +241,3 @@ namespace emscripten { }
}
-
-
|