Jason Turner 9cf5064a3b Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	src/reflection.cpp
2014-02-22 16:41:28 -07:00
..
dispatchkit Merge branch 'master' into ChaiScript_5_0_CPP_11 2014-02-22 16:41:28 -07:00
language Merge branch 'master' into ChaiScript_5_0_CPP_11 2014-02-17 16:31:16 -07:00
utility Merge branch 'master' into ChaiScript_5_0_CPP_11 2014-02-17 16:31:16 -07: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 Make stdlib 2012-06-03 08:11:37 -06: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