Merge branch 'develop' into sol3

Browse Source

# Conflicts:
#	include/single/sol/sol.hpp
#	include/sol/container_traits.hpp

...

This commit is contained in:

ThePhD 2018-09-27 22:29:29 -07:00

parent 0a9dc24f1f 4f974a7424

commit 03979d2200

No known key found for this signature in database

GPG Key ID: 1509DB1C0F702BFA

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available