[frontierkernel-commits] Frontier/Common/windoidWDEF windoidWDEF.c,1.1,1.1.4.1 windoidWDEF.r,1.2,1.2.4.1

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/windoidWDEF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/windoidWDEF

Modified Files:
      Tag: sidewinder-branch
	windoidWDEF.c windoidWDEF.r 
Log Message:
final merge step

Index: windoidWDEF.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/windoidWDEF/windoidWDEF.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** windoidWDEF.c	9 Oct 2004 06:09:42 -0000	1.1
--- windoidWDEF.c	17 Jan 2005 01:19:49 -0000	1.1.4.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************
  

Index: windoidWDEF.r
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/windoidWDEF/windoidWDEF.r,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** windoidWDEF.r	26 Oct 2004 10:23:10 -0000	1.2
--- windoidWDEF.r	17 Jan 2005 01:19:49 -0000	1.2.4.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************
  
***************
*** 24,28 ****
  ******************************************************************************/
  
- 
  #include "frontier.r"
  
--- 26,29 ----