#
# ChangeLog for code/branches/masterserverfix
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 12:50:09 PM

Wed, 16 Nov 2011 13:32:57 GMT smerkli [8935]
	* code/branches/masterserverfix/src/libraries/network/MasterServer.cc (modified)
	* code/branches/masterserverfix/src/libraries/network/MasterServer.h (modified)
	* code/branches/masterserverfix/src/libraries/network/ServerList.cc (modified)
	* code/branches/masterserverfix/src/libraries/network/ServerList.h (modified)

	merged changes from masterserver2 branch into newer trunk here.


Wed, 16 Nov 2011 13:02:06 GMT smerkli [8933]
	* code/branches/masterserverfix (copied)




Sat, 22 Oct 2011 13:28:35 GMT baermatt [8903]
	* code/trunk/src/orxonox/sound/SoundManager.cc (modified)

	Just excluding alutInit and alutExit on Mac OS X, because it causes ...