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

Merge branch 'master' into ChaiScript_5_0_CPP_11

2013-05-27 08:48:59 -06:00