Jason Turner 5a380abc68 Merge branch 'master' into 2011-09-09-CxScript ...

Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/dispatchkit.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	src/multithreaded.cpp

2012-06-03 09:27:05 -06:00

..

dispatchkit

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

2012-06-03 09:27:05 -06:00

language

Make stdlib

2012-06-03 08:11:37 -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

Update copyrights to 2012 #23

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

chaiscript.hpp

Make stdlib

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