Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: include/chaiscript/dispatchkit/proxy_functions_detail.hpp
2013-04-25 16:17:51 -06:00
parent 494a67c9a0 feb344e744
commit 6e71409a52
2 changed files with 4 additions and 5 deletions
--- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -59,7 +59,6 @@ namespace chaiscript
      template<typename ... Rest> 
        struct Try_Cast; 

-      // implementation
      template<typename Param, typename ... Rest>
        struct Try_Cast<Param, Rest...>
        {