Jason Turner 947d7c2591 Merge branch 'develop' into update_travis_toolchain
Conflicts:
	.decent_ci-Windows.yaml
	CMakeLists.txt
	include/chaiscript/chaiscript_defines.hpp
2016-03-05 21:12:14 -07:00
..
chaiscript_algebraic.hpp Update copyrights 2016-02-14 20:04:17 -07:00
chaiscript_common.hpp Drop ifdef'd code for gcc4.6 and msvc12 2016-03-04 11:15:39 -07:00
chaiscript_engine.hpp Drop ifdef'd code for gcc4.6 and msvc12 2016-03-04 11:15:39 -07:00
chaiscript_eval.hpp Drop ifdef'd code for gcc4.6 and msvc12 2016-03-04 11:15:39 -07:00
chaiscript_parser.hpp Merge branch 'develop' into update_travis_toolchain 2016-03-05 21:12:14 -07:00
chaiscript_prelude_docs.hpp Correct docs for 'filter' 2015-06-10 18:44:30 -06:00
chaiscript_prelude.chai Fix vector element assignment issues 2015-10-15 21:20:12 -06:00