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
..
2009-09-16 01:46:04 +00:00
2011-09-21 08:36:46 -06:00
2013-02-23 21:27:01 -07:00
2011-10-01 11:03:03 -06:00
2011-06-07 14:59:43 -06:00
2009-09-16 01:46:04 +00:00
2014-03-26 15:20:06 -06:00