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

..

chaiscript

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

2012-06-22 18:12:51 -06:00