Jason Turner 6cda1140c4 Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/language/chaiscript_common.hpp
	include/chaiscript/language/chaiscript_eval.hpp
	include/chaiscript/language/chaiscript_parser.hpp
2012-06-22 18:12:51 -06:00
..
dispatchkit Enhance and correct error messages 2012-06-22 18:00:10 -06:00
language Merge branch 'master' into 2011-09-09-CxScript 2012-06-22 18:12:51 -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