Jason Turner 52bb08f4d5 Merge branch 'master' into ChaiScript_5_0_CPP_11 ...

Conflicts:
	include/chaiscript/dispatchkit/bootstrap_stl.hpp
	include/chaiscript/language/chaiscript_engine.hpp
	include/chaiscript/language/chaiscript_prelude.hpp

2014-02-17 16:31:16 -07: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 branch 'master' into ChaiScript_5_0_CPP_11

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

chaiscript_engine.hpp

Merge branch 'master' into ChaiScript_5_0_CPP_11

2014-02-17 16:31:16 -07: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 branch 'master' into ChaiScript_5_0_CPP_11

2014-02-17 16:31:16 -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

Get ChaiScript ported to MSVC 2013. See Notes in code.

2013-11-02 07:42:06 -06:00