You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3mp/components/openmw-mp/Base
David Cernat 8b482e19ec Merge pull request #453 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Objects.cpp
	apps/openmw-mp/Script/Functions/Objects.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
7 years ago
..
BaseActor.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
BaseNetCreature.hpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 7 years ago
BaseObject.hpp Merge pull request #453 from TES3MP/0.6.3 while resolving conflicts 7 years ago
BasePacketProcessor.hpp Fix build for gcc-5.4.0 7 years ago
BasePlayer.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
BaseStructs.hpp Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts 7 years ago
BaseWorldstate.hpp Merge pull request #452 from TES3MP/0.6.3 while resolving conflicts 7 years ago