Jason Turner 926e962fc0 Merge remote-tracking branch 'origin/release-4.x'
Conflicts:
	.travis.yml
	CMakeLists.txt
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/boxed_cast.hpp
	include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
	include/chaiscript/dispatchkit/function_call_detail.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/language/chaiscript_common.hpp
2014-03-29 07:30:14 -06:00
..
dispatchkit Merge remote-tracking branch 'origin/release-4.x' 2014-03-29 07:30:14 -06:00
language Merge remote-tracking branch 'origin/release-4.x' 2014-03-29 07:30:14 -06:00
utility Re-enable C++11 registration utility 2014-03-22 16:24:16 -06:00
chaiscript_defines.hpp Get ChaiScript ported to MSVC 2013. See Notes in code. 2013-11-02 07:42:06 -06:00
chaiscript_stdlib.hpp Eliminate warnings on MSVC 2013 2014-03-02 08:18:36 -07:00
chaiscript_threading.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2014-02-17 16:31:16 -07:00
chaiscript.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2014-02-17 16:31:16 -07:00