Jason Turner 47e44d2f9e Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/boxed_cast.hpp
	include/chaiscript/dispatchkit/boxed_cast_helper.hpp
	include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
	include/chaiscript/dispatchkit/dynamic_object.hpp
	include/chaiscript/dispatchkit/exception_specification.hpp
	include/chaiscript/dispatchkit/function_call.hpp
	include/chaiscript/dispatchkit/function_call_detail.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	include/chaiscript/language/chaiscript_engine.hpp
	include/chaiscript/language/chaiscript_eval.hpp
2013-02-25 12:08:32 -07:00
..
chaiscript_algebraic.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
chaiscript_common.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-23 21:37:50 -07:00
chaiscript_engine.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-25 12:08:32 -07:00
chaiscript_eval.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-25 12:08:32 -07:00
chaiscript_parser.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-24 14:30:41 -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.chai Use C++11 Raw Strings for chaiscript prelude 2012-06-28 21:24:51 -06:00