From 967f52dd997c56c11269ff8b86e95e23f620acb4 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 11:57:13 +0000 Subject: * Delete some obsolete files related to squadmarking * Some inconsequential tremsvn-diff-reduction --- src/qcommon/q_shared.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/qcommon') diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 84408371..68fd619a 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -1039,7 +1039,12 @@ typedef struct { #define MAX_STATS 16 #define MAX_PERSISTANT 16 #define MAX_MISC 16 +<<<<<<< #define MAX_WEAPONS 16 +||||||| +======= +#define MAX_WEAPONS 16 +>>>>>>> #define MAX_PS_EVENTS 2 -- cgit