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
..
chaiscript_algebraic.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
chaiscript_common.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-06-25 15:40:19 -06:00
chaiscript_engine.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-06-25 15:40:19 -06:00
chaiscript_eval.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-06-25 15:40:19 -06:00
chaiscript_parser.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-06-22 18:12:51 -06:00
chaiscript_prelude_docs.hpp Finalize documentation for 3.0.0 release and update version number in CMakeLists.txt 2011-05-20 13:44:34 -06:00
chaiscript_prelude.hpp Merge branch '2011-09-09-CxScript' of github.com:ChaiScript/ChaiScript into 2011-09-09-CxScript 2012-05-17 10:16:35 -07:00