conflict fix
This commit is contained in:
1 parent
6ef9c0b305
commit
9354a0ab88
1 file changed
+1
-1
+1
-1
@@ -2420,7 +2420,7 @@ Ping_gfx_num (int lag)
|
||||
// HU_drawPing
|
||||
//
|
||||
|
||||
void HU_drawPing(INT32 x, INT32 y, UINT32 lag, INT32 flags)
|
||||
void HU_drawPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
|
||||
{
|
||||
UINT8 *colormap = NULL;
|
||||
INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
|
||||
|
||||
Reference in new issue
Block a user