ThePhD 162746dac9 Merge branch 'develop' into sol3 ... # Conflicts: # docs/source/tutorial/variables.rst # include/single/sol/sol.hpp # include/single/sol/sol_forward.hpp # include/sol/proxy.hpp # sol/usertype_metatable.hpp		2018-11-10 07:12:13 -08:00
..
usertype_metatable.hpp	Fix up the remaining sol2 issues, prepare for more sol3 stuff	2018-11-10 06:41:06 -08:00