[Jake2-commits] jake2/src/jake2 Globals.java,1.3,1.3.2.1 Defines.java,1.2,1.2.2.1

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2637/src/jake2

Modified Files:
      Tag: r_0_9
	Globals.java Defines.java 
Log Message:
merge changes for 0.9.3

Index: Defines.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/Defines.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Defines.java	8 Jul 2004 15:58:46 -0000	1.2
--- Defines.java	6 Sep 2004 19:39:19 -0000	1.2.2.1
***************
*** 1368,1380 ****
  	public final static String NO_SERVER_STRING = "<no server>";
  	public final static int NUM_ADDRESSBOOK_ENTRIES = 9;
- 
- 	//	// rserr_t
- 		static final int rserr_ok = 0;
- 
- 	static final int rserr_invalid_fullscreen = 1;
- 
- 	static final int rserr_invalid_mode = 2;
- 
- 	static final int rserr_unknown = 3;
- 
  }
--- 1368,1370 ----

Index: Globals.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/Globals.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** Globals.java	8 Jul 2004 20:24:48 -0000	1.3
--- Globals.java	6 Sep 2004 19:39:19 -0000	1.3.2.1
***************
*** 129,134 ****
  	public static FileWriter log_stats_file = null;
  
- 	public static EndianHandler endian = null;
- 
  	public static cvar_t m_pitch;
  	public static cvar_t m_yaw;
--- 129,132 ----