Jason Turner 986699a3fe Merge branch 'develop' into smaller_make_shared ...

And also apply cleanups suggested from resharper

Conflicts:
	include/chaiscript/language/chaiscript_parser.hpp

2015-04-27 11:55:12 -06:00

..

dispatchkit

Merge branch 'develop' into smaller_make_shared

2015-04-27 11:55:12 -06:00

language

Merge branch 'develop' into smaller_make_shared

2015-04-27 11:55:12 -06:00

utility

Code simplifications and spelling fixes found by clion

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

chaiscript_defines.hpp

A smaller make_shared derived types

2015-04-24 21:35:56 -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

Reduce copies of UDTs

2015-04-07 10:23:43 -06:00

chaiscript.hpp

Merge branch 'master' into develop

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