Commit Graph

4 Commits

Author SHA1 Message Date
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
ThePhD
094ace3c7b
freeze changes 2018-11-20 11:59:36 -05:00
ThePhD
9b47849110
update tests (which compile, but now all fail) 2018-11-18 13:06:01 -05:00
ThePhD
0a9dc24f1f
first big sol3 push... tests not updated yet 2018-09-27 22:27:38 -07:00