2 Commits

Author	SHA1	Message	Date
ThePhD	31e7857870	Merge remote-tracking branch 'root/develop' into develop ... # Conflicts: # examples/usertype.cpp # sol.hpp # sol/debug.hpp # sol/default_construct.hpp # sol/demangle.hpp # sol/deprecate.hpp # sol/error.hpp # sol/function.hpp # sol/function_types.hpp # sol/object.hpp # sol/proxy.hpp # sol/reference.hpp # sol/resolve.hpp # sol/stack.hpp # sol/state.hpp # sol/table.hpp # sol/traits.hpp # sol/tuple.hpp # sol/types.hpp # sol/usertype.hpp # sol/usertype_traits.hpp	2016-01-24 12:16:38 -05:00
Rapptz	a5e24b4fa2	Fix userdata -> usertype in examples.	2015-07-21 19:26:35 -04:00