Jason Turner 90125d0f9a Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
	contrib/geshi/chaiscript.php
	include/chaiscript/language/chaiscript_common.hpp
	include/chaiscript/language/chaiscript_eval.hpp
	include/chaiscript/language/chaiscript_parser.hpp
2012-05-18 09:05:46 -06:00
..
chaiscript_algebraic.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
chaiscript_common.hpp Adding support for switch/case/default to 4.x 2012-05-17 13:56:10 -07:00
chaiscript_engine.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
chaiscript_eval.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-05-18 09:05:46 -06:00
chaiscript_parser.hpp Adding support for switch/case/default to 4.x 2012-05-17 13:56:10 -07: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