Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: include/chaiscript/dispatchkit/bind_first.hpp include/chaiscript/dispatchkit/bootstrap_stl.hpp include/chaiscript/dispatchkit/boxed_cast.hpp include/chaiscript/dispatchkit/function_call_detail.hpp include/chaiscript/dispatchkit/proxy_functions_detail.hpp
2012-11-07 17:04:54 -07:00
parent c5a86401aa 923369a4f4
commit 57c6d72a79
4 changed files with 16 additions and 82 deletions
--- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -143,7 +143,6 @@ namespace chaiscript
    }
  }

-
 }