Jason Turner 47e44d2f9e Merge branch 'master' into ChaiScript_5_0_CPP_11 ...

Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/boxed_cast.hpp
	include/chaiscript/dispatchkit/boxed_cast_helper.hpp
	include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
	include/chaiscript/dispatchkit/dynamic_object.hpp
	include/chaiscript/dispatchkit/exception_specification.hpp
	include/chaiscript/dispatchkit/function_call.hpp
	include/chaiscript/dispatchkit/function_call_detail.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	include/chaiscript/language/chaiscript_engine.hpp
	include/chaiscript/language/chaiscript_eval.hpp

2013-02-25 12:08:32 -07:00

..

dispatchkit

Merge branch 'master' into ChaiScript_5_0_CPP_11

2013-02-25 12:08:32 -07:00

language

Merge branch 'master' into ChaiScript_5_0_CPP_11

2013-02-25 12:08:32 -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