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
..
chaiscript_stdlib.cpp Fix #98 for unavoidable C style returns in modules 2014-01-23 13:08:08 -07:00
main.cpp Cleanup search for chaiscript_stdlib and fix some bugs 2014-03-23 16:42:04 -06:00
reflection.cpp Re-enable C++11 registration utility 2014-03-22 16:24:16 -06:00
stl_extra.cpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2014-02-17 16:31:16 -07:00
test_module.cpp Merge remote-tracking branch 'origin/release-4.x' 2014-03-29 07:30:14 -06:00