Commit Graph

2 Commits

Author SHA1 Message Date
ThePhD
f75d335988
Merge remote-tracking branch 'origin/develop' into sol3
# Conflicts:
#	include/single/sol/sol.hpp
#	include/single/sol/sol_forward.hpp
2018-11-09 08:26:27 -08:00
ThePhD
0a9dc24f1f
first big sol3 push... tests not updated yet 2018-09-27 22:27:38 -07:00