Akkadius dd6d1d5511 Merge remote-tracking branch 'remotes/origin/master' into web_interface ...

Conflicts:
	CMakeLists.txt
	common/logtypes.h
	common/shareddb.cpp
	world/net.cpp
	zone/client_logs.cpp
	zone/corpse.cpp
	zone/mob.cpp
	zone/net.cpp

2015-02-02 23:11:31 -06:00

..

detail

Hopefully completely merged from master in what is the biggest merge ever

2014-12-07 13:23:16 -08:00

adopt_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

back_reference_fwd.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

back_reference.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

class_info.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

class.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

config.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

container_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

copy_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

dependency_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

discard_result_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

error.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

exception_handler.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

from_stack.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

function.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

get_main_thread.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

get_pointer.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

handle.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

iterator_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

lua502.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

lua_include.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

luabind.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

make_function.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

nil.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

object.hpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

open.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

operator.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

out_value_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

prefix.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

raw_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

return_reference_to_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

scope.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

shared_ptr_converter.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

tag_function.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

typeid.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

value_wrapper.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

version.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

weak_ref.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

wrapper_base.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00

yield_policy.hpp

Reworking a lot of stuff at once, this will look very chaotic.

2014-07-14 15:09:55 -07:00