Merge branch 'master' into 2011-09-09-CxScript

Conflicts: include/chaiscript/dispatchkit/bootstrap.hpp include/chaiscript/dispatchkit/dispatchkit.hpp include/chaiscript/dispatchkit/proxy_functions_detail.hpp src/multithreaded.cpp
2012-06-03 09:27:05 -06:00
parent 4ebfe264e9 d2aba2ef56
commit 5a380abc68
1 changed files with 7 additions and 9 deletions
--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -104,7 +104,6 @@ namespace chaiscript
      return ss.str();
    }

-
    /**
     * Internal function for converting from a string to a value
     * uses ostream operator >> to perform the conversion
@@ -119,7 +118,6 @@ namespace chaiscript
    }
      
            
-
    /**
    * Add all common functions for a POD type. All operators, and
    * common conversions