Jason Turner 6a7a934e3e Merge branch 'develop' of github.com:ChaiScript/ChaiScript into multithreaded_performance ...

Conflicts:
	include/chaiscript/language/chaiscript_eval.hpp

2015-07-16 13:16:04 -06:00

..

dispatchkit

Merge branch 'develop' of github.com:ChaiScript/ChaiScript into multithreaded_performance

2015-07-16 13:16:04 -06:00

language

Merge branch 'develop' of github.com:ChaiScript/ChaiScript into multithreaded_performance

2015-07-16 13:16:04 -06:00

utility

Code simplifications and spelling fixes found by clion

2015-04-27 08:09:31 -06:00

chaiscript_defines.hpp

g++4.6 correction

2015-06-01 16:08:04 -06:00

chaiscript_stdlib.hpp

Move prelude into stdlib so it's not included everywhere

2015-05-23 16:16:39 -06:00

chaiscript_threading.hpp

Add note about handling of thread contexts

2015-07-11 18:34:09 -06:00

chaiscript.hpp

Merge branch 'master' into develop

2015-03-13 22:28:24 -06:00