diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 11:57:13 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:32 +0000 |
| commit | 967f52dd997c56c11269ff8b86e95e23f620acb4 (patch) | |
| tree | 464eae10672b7ddabae911b969bf04755b0f6322 /src/qcommon/q_shared.h | |
| parent | 275c95290dde81f6949d99e8d818db54d7859d88 (diff) | |
* Delete some obsolete files related to squadmarking
* Some inconsequential tremsvn-diff-reduction
Diffstat (limited to 'src/qcommon/q_shared.h')
| -rw-r--r-- | src/qcommon/q_shared.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 |