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

..

dispatchkit

Merge branch 'master' into ChaiScript_5_0_CPP_11

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

language

Merge branch 'master' into ChaiScript_5_0_CPP_11

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

utility

Update copyrights to 2012 #23

2012-05-16 11:55:51 -06:00

chaiscript_defines.hpp

Make stdlib

2012-06-03 08:11:37 -06:00

chaiscript_stdlib.hpp

Make stdlib

2012-06-03 08:11:37 -06:00

chaiscript_threading.hpp

- Fix legit threading issue which shows itself on clang / macos mostly

2013-05-26 22:47:23 -06:00

chaiscript.hpp

Merge branch 'master' into 2011-09-09-CxScript

2012-07-16 22:12:29 -06:00