ThePhD d15709d85a Merge branch 'develop' into sol3 ... # Conflicts: # include/single/sol/sol.hpp # include/single/sol/sol_forward.hpp # include/sol/coroutine.hpp # include/sol/stack_core.hpp # sol/usertype_metatable.hpp		2018-11-21 08:19:26 -05:00
..
single/sol	first big sol3 push... tests not updated yet	2018-09-27 22:27:38 -07:00
sol	Merge branch 'develop' into sol3	2018-11-21 08:19:26 -05:00