Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: include/chaiscript/dispatchkit/bootstrap_stl.hpp include/chaiscript/language/chaiscript_parser.hpp unittests/multithreaded_test.cpp
2012-11-16 16:32:39 -07:00
parent 6bb90f9d6d 58f3256389
commit 85ba42849b
2 changed files with 3 additions and 1 deletions
--- a/unittests/multithreaded_test.cpp
+++ b/unittests/multithreaded_test.cpp
@@ -7,6 +7,7 @@
 #include <iostream>

 #include <list>
+#include <algorithm>

 #include <chaiscript/chaiscript.hpp>