Jason Turner 5cb78ecd68 Merge branch 'master' into ChaiScript_5_0_CPP_11 ...

Conflicts:
	include/chaiscript/dispatchkit/bootstrap_stl.hpp
	include/chaiscript/dispatchkit/boxed_number.hpp

2013-11-27 09:18:08 -07:00

..

dispatchkit

Merge branch 'master' into ChaiScript_5_0_CPP_11

2013-11-27 09:18:08 -07:00

language

Merge branch 'master' into ChaiScript_5_0_CPP_11

2013-11-27 09:18:08 -07:00

utility

Get ChaiScript ported to MSVC 2013. See Notes in code.

2013-11-02 07:42:06 -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

Make stdlib

2012-06-03 08:11:37 -06:00

chaiscript_threading.hpp

Merge branch 'master' into ChaiScript_5_0_CPP_11

2013-11-27 09:18:08 -07:00

chaiscript.hpp

Merge branch 'master' into 2011-09-09-CxScript

2012-07-16 22:12:29 -06:00