Merge branch 'develop' into smaller_make_shared

And also apply cleanups suggested from resharper Conflicts: include/chaiscript/language/chaiscript_parser.hpp
2015-04-27 11:55:12 -06:00
parent 7a13b6b801 8889324b2d
commit 986699a3fe
26 changed files with 168 additions and 242 deletions
--- a/include/chaiscript/language/chaiscript_algebraic.hpp
+++ b/include/chaiscript/language/chaiscript_algebraic.hpp
@@ -9,8 +9,6 @@

 #include <string>

-#include "../dispatchkit/dispatchkit.hpp"
-
 namespace chaiscript
 {