From DONOTREPLY at icculus.org  Mon Jun 16 04:24:13 2014
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 16 Jun 2014 08:24:13 -0000
Subject: [rott-commits] r278 - trunk/rott
Message-ID: <20140616082413.31009.qmail@icculus.org>

Author: fabian
Date: 2014-06-16 04:24:13 -0400 (Mon, 16 Jun 2014)
New Revision: 278

Modified:
   trunk/rott/rt_menu.c
Log:
fix conflicting types in variable declarations



Modified: trunk/rott/rt_menu.c
===================================================================
--- trunk/rott/rt_menu.c	2013-09-07 21:37:18 UTC (rev 277)
+++ trunk/rott/rt_menu.c	2014-06-16 08:24:13 UTC (rev 278)
@@ -5359,9 +5359,9 @@
 
    FlipMenuBuf();
 }
-extern long inverse_mouse;
+extern int inverse_mouse;
 extern boolean usemouselook;
-extern int iG_aimCross;
+extern boolean iG_aimCross;
 extern boolean usejump;
 extern boolean sdl_fullscreen;