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

..

dispatchkit

Merge branch 'develop' into update_travis_toolchain

2016-03-05 21:12:14 -07:00

language

Merge branch 'develop' into update_travis_toolchain

2016-03-05 21:12:14 -07:00

utility

Merge branch 'develop' into update_travis_toolchain

2016-03-05 21:12:14 -07:00

chaiscript_defines.hpp

Merge branch 'develop' into update_travis_toolchain

2016-03-05 21:12:14 -07:00

chaiscript_stdlib.hpp

Enable thread local in MSVC 2015

2016-02-02 09:18:08 -07:00

chaiscript_threading.hpp

Update copyrights

2016-02-14 20:04:17 -07:00

chaiscript.hpp

Update copyrights

2016-02-14 20:04:17 -07:00