Jason Turner 85ba42849b 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
..
chaiscript_algebraic.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
chaiscript_common.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-06-25 15:40:19 -06:00
chaiscript_engine.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-07-16 22:12:29 -06:00
chaiscript_eval.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2012-11-10 16:59:32 -07:00
chaiscript_parser.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2012-11-16 16:32:39 -07:00
chaiscript_prelude_docs.hpp Finalize documentation for 3.0.0 release and update version number in CMakeLists.txt 2011-05-20 13:44:34 -06:00
chaiscript_prelude.chai Use C++11 Raw Strings for chaiscript prelude 2012-06-28 21:24:51 -06:00