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

Conflicts:
	CMakeLists.txt
	include/chaiscript/language/chaiscript_common.hpp
	include/chaiscript/language/chaiscript_engine.hpp
	include/chaiscript/language/chaiscript_eval.hpp

2012-06-25 15:40:19 -06:00

..

dispatchkit

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

2012-06-25 15:40:19 -06:00

language

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

2012-06-25 15:40:19 -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

Correct some threading issues

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

chaiscript.hpp

Make stdlib

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