#
# ChangeLog for code/branches/presentation/src/libraries/network/WANDiscovery.cc
#
# Generated by Trac 1.0.9
# May 23, 2024, 4:02:56 PM

Wed, 08 Dec 2010 15:25:52 GMT dafrick [7739]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentation/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation/src/libraries/network/MasterServer.cc (copied)
	* code/branches/presentation/src/libraries/network/MasterServer.h (copied)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (copied)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (copied)
	* code/branches/presentation/src/libraries/network/MasterServerProtocol.h (copied)
	* code/branches/presentation/src/libraries/network/PeerList.cc (copied)
	* code/branches/presentation/src/libraries/network/PeerList.h (copied)
	* code/branches/presentation/src/libraries/network/Server.cc (modified)
	* code/branches/presentation/src/libraries/network/Server.h (modified)
	* code/branches/presentation/src/libraries/network/ServerList.cc (copied)
	* code/branches/presentation/src/libraries/network/ServerList.h (copied)
	* code/branches/presentation/src/libraries/network/WANDiscovery.cc (copied)
	* code/branches/presentation/src/libraries/network/WANDiscovery.h (copied)
	* code/branches/presentation/src/libraries/network/packet/ServerInformation.h (modified)
	* code/branches/presentation/src/orxonox/Main.cc (modified)
	* code/branches/presentation/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc (copied)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.h (copied)

	Merging masterserver branch to new presentation branch.


Wed, 08 Dec 2010 15:08:22 GMT smerkli [7737]
	* code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified)

	pre-merge