diff options
author | mey <mey@imvu.com> | 2012-11-09 17:10:10 -0800 |
---|---|---|
committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:21:46 +0300 |
commit | 01212260c27a76c7f02b62a4c42c3d4501351e60 (patch) | |
tree | fb521e7f58db16929376bb1c6e064fbef1a4a5dd | |
parent | d622aa9caba106ddc31f6aee01082eb029a35515 (diff) |
Merging.
-rw-r--r-- | system/include/emscripten/bind.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h index 1ce7967d..97a9b5cc 100644 --- a/system/include/emscripten/bind.h +++ b/system/include/emscripten/bind.h @@ -100,8 +100,6 @@ namespace emscripten { GenericFunction destructor, GenericFunction getPointee); -<<<<<<< HEAD -======= void _embind_register_function_ptr( const char* name, TYPEID functorType, @@ -111,7 +109,6 @@ namespace emscripten { GenericFunction destructor, GenericFunction invoker); ->>>>>>> Exposing std::function to javascript. void _embind_register_vector( TYPEID vectorType, TYPEID elementType, |