Jason Turner 1708024372 Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/chaiscript_threading.hpp
	include/chaiscript/dispatchkit/boxed_value.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	samples/example.cpp
	src/test_module.cpp
	unittests/multithreaded_test.cpp
2013-05-27 08:48:59 -06:00
..
chaiscript_algebraic.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
chaiscript_common.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-23 21:37:50 -07:00
chaiscript_engine.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-05-27 08:48:59 -06:00
chaiscript_eval.hpp Merge branch 'master' of https://github.com/ChaiScript/ChaiScript 2013-03-28 21:18:44 -06:00
chaiscript_parser.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-24 14:30:41 -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