| Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
.gitignore
banmasters.cfg
src/banmaster/banmaster.cpp
src/engine/server/server.cpp
src/engine/shared/network.h
src/engine/shared/network_server.cpp
|
|
|
|
|
|
Conflicts:
src/engine/server/server.cpp
src/engine/server/server.h
src/engine/shared/config_variables.h
src/engine/shared/network.h
src/engine/shared/network_server.cpp
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/engine/server.h
src/engine/server/server.cpp
src/engine/server/server.h
src/engine/shared/network.h
src/engine/shared/network_server.cpp
src/game/server/player.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fixed a warning
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|