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 Merge branch 'develop' into update_travis_toolchain 2016-03-05 21:12:14 -07:00