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
..
json_wrap.hpp Older compiler backport issues 2015-10-02 12:46:50 -06:00
json.hpp Various Windows fixes 2016-03-04 17:39:32 -07:00
utility.hpp Drop ifdef'd code for gcc4.6 and msvc12 2016-03-04 11:15:39 -07:00