Jason Turner 926e962fc0 Merge remote-tracking branch 'origin/release-4.x' ...

Conflicts:
	.travis.yml
	CMakeLists.txt
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/boxed_cast.hpp
	include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
	include/chaiscript/dispatchkit/function_call_detail.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/language/chaiscript_common.hpp

2014-03-29 07:30:14 -06:00

..

chaiscript_algebraic.hpp

Merge branch 'master' into ChaiScript_5_0_CPP_11

2014-02-17 16:31:16 -07:00

chaiscript_common.hpp

Merge remote-tracking branch 'origin/release-4.x'

2014-03-29 07:30:14 -06:00

chaiscript_engine.hpp

Merge remote-tracking branch 'origin/release-4.x'

2014-03-29 07:30:14 -06:00

chaiscript_eval.hpp

Merge branch 'master' into ChaiScript_5_0_CPP_11

2014-02-17 16:31:16 -07:00

chaiscript_parser.hpp

Merge remote-tracking branch 'origin/release-4.x'

2014-03-29 07:30:14 -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.chai

Eliminate warnings on MSVC 2013

2014-03-02 08:18:36 -07:00