about summary refs log tree commit diff
path: root/src/versionsrv/versionsrv.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2013-02-24 18:55:55 +0100
committeroy <Tom_Adams@web.de>2013-02-24 18:55:55 +0100
commit0e92dd560300a0b255b5c173e715f2714e7c1765 (patch)
treecc261eadddbd707b56dd018757c251a578a98384 /src/versionsrv/versionsrv.cpp
parent118d2ac837537cd625679a57aca03cd47f2e71a1 (diff)
downloadzcatch-0e92dd560300a0b255b5c173e715f2714e7c1765.tar.gz
zcatch-0e92dd560300a0b255b5c173e715f2714e7c1765.zip
fixed some merge problems
Diffstat (limited to 'src/versionsrv/versionsrv.cpp')
-rw-r--r--src/versionsrv/versionsrv.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/versionsrv/versionsrv.cpp b/src/versionsrv/versionsrv.cpp
index da55e717..9d6e2960 100644
--- a/src/versionsrv/versionsrv.cpp
+++ b/src/versionsrv/versionsrv.cpp
@@ -7,6 +7,7 @@
 #include <game/version.h>
 
 #include "versionsrv.h"
+#include "mapversions.h"
 
 enum {
 	MAX_MAPS_PER_PACKET=48,