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

..

dispatchkit

Fix function pointer issue for substr on VS 2010 32bit

2012-11-16 13:58:03 -07:00

language

Merge branch 'master' into ChaiScript_5_0_CPP_11

2012-11-16 16:32:39 -07: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

Correct some threading issues

2012-06-22 14:18:44 -06:00

chaiscript.hpp

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

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