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
..
basic.cpp	Add more examples	2014-01-18 22:59:59 -05:00
config.cpp	Add more examples	2014-01-18 22:59:59 -05:00
config.lua	Add basic examples directory	2013-12-16 11:17:33 -05:00
functions.cpp	Add more examples	2014-01-18 22:59:59 -05:00
tables.cpp	Improve formatting of table example	2015-01-15 11:53:15 -05:00
usertype.cpp	Merge remote-tracking branch 'root/develop' into develop	2016-01-24 12:16:38 -05:00
variables.cpp	Add more examples	2014-01-18 22:59:59 -05:00