# # ChangeLog for code/branches/masterserverfix/src/libraries # # Generated by Trac 1.0.9 # Dec 13, 2024, 11:43:00 AM 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, 08 Oct 2011 10:57:54 GMT baermatt [8879] * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) Added 'ull' to some OutputContextMasks, because of an error with LLVM ...