Commit Graph

2 Commits

Author SHA1 Message Date
ThePhD
1e514f145f
Merge branch 'develop' into sol3
# Conflicts:
#	include/single/sol/sol.hpp
#	include/single/sol/sol_forward.hpp
2018-11-27 22:20:59 -05:00
ThePhD
0a9dc24f1f
first big sol3 push... tests not updated yet 2018-09-27 22:27:38 -07:00