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
..
2018-11-10 07:12:13 -08:00
2017-03-22 22:34:24 -04:00
2018-11-09 14:36:27 -08:00