Jason Turner 1113cafca2 Merge branch 'develop' of github.com:ChaiScript/ChaiScript into develop ... Conflicts: CMakeLists.txt		2015-03-21 21:04:03 -06:00
..
dispatchkit	Various code cleanups	2015-01-31 10:10:35 -07:00
language	Minor cleanups, increment to 5.7.0	2015-03-21 20:56:28 -06:00
utility	Get ready for 5.6.0 release	2015-01-17 07:05:10 -07:00
chaiscript_defines.hpp	Merge branch 'develop' of github.com:ChaiScript/ChaiScript into develop	2015-03-21 21:04:03 -06:00
chaiscript_stdlib.hpp	Add future support, and fix returning of r-values	2015-01-06 15:31:06 -07:00
chaiscript_threading.hpp	Get ready for 5.6.0 release	2015-01-17 07:05:10 -07:00
chaiscript.hpp	Merge branch 'master' into develop	2015-03-13 22:28:24 -06:00