Prepare a DIFF of MOST folders, with OUTPUT to tempdiff.txt file 
Date: Sat 07/11/2009 Time: 14:38:52.60 
Using sources from C:\FGCVS ... 
#BEGIN FlightGear 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\FlightGear\source FlightGear 
#DIFF ==================================================================== 
#END ==================================================================== 
#BEGIN freeglut 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\freeglut freeglut 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\freeglut\include\GL\freeglut_std.h freeglut\include\GL\freeglut_std.h
--- C:\FGCVS\freeglut\include\GL\freeglut_std.h	Thu Jul 09 10:23:58 2009
+++ freeglut\include\GL\freeglut_std.h	Sat Jul 11 12:24:52 2009
@@ -57,7 +57,9 @@
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN 1
 #  endif
+#ifndef NOMINMAX
 #   define NOMINMAX
+#endif
 #   include <Windows.h>
 
 /* Windows static library */
#END ==================================================================== 
#BEGIN OpenSceneGraph 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\OpenSceneGraph OpenSceneGraph 
#DIFF Ignored ALL changes due to reversion to PREV SVN
#END ==================================================================== 
#BEGIN PLIB 
Only in PLIB\src\js: jsName.cxx
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\PLIB PLIB 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\PLIB\src\js\jsWindows.cxx PLIB\src\js\jsWindows.cxx
--- C:\FGCVS\PLIB\src\js\jsWindows.cxx	Fri Mar 13 12:31:50 2009
+++ PLIB\src\js\jsWindows.cxx	Fri Mar 13 15:58:18 2009
@@ -25,6 +25,8 @@
 
 #if defined (UL_WIN32)
 
+extern int getJSName( char * name, int len );
+
 #define _JS_MAX_AXES_WIN 8  /* X,Y,Z,R,U,V,POV_X,POV_Y */
 
 struct os_specific_s {
@@ -122,10 +124,13 @@
     // at least for USB.  Try to get the real name from the registry.
     if ( ! os->getOEMProductName ( this, name, sizeof(name) ) )
     {
-      ulSetError ( UL_WARNING,
-                   "JS: Failed to read joystick name from registry" ) ;
-
-      strncpy ( name, os->jsCaps.szPname, sizeof(name) ) ;
+        if ( ! getJSName( name, sizeof(name) ) )
+        {
+            ulSetError ( UL_WARNING,
+                    "JS: Failed to read joystick name from registry" ) ;
+ 
+            strncpy ( name, os->jsCaps.szPname, sizeof(name) ) ;
+        }
     }
 
     // Windows joystick drivers may provide any combination of
#END ==================================================================== 
#BEGIN pthreads 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\pthreads pthreads 
#DIFF ==================================================================== 
#END ==================================================================== 
#BEGIN Simgear 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source Simgear 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\magvar\coremag.cxx Simgear\simgear\magvar\coremag.cxx
--- C:\FGCVS\SimGear\source\simgear\magvar\coremag.cxx	Wed Sep 10 12:28:57 2008
+++ Simgear\simgear\magvar\coremag.cxx	Sat Jul 11 12:48:10 2009
@@ -74,11 +74,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
-<<<<<<< coremag.cxx
-// $Id: coremag.cxx,v 1.5 2006-10-28 22:12:48 curt Exp $
-=======
 // $Id: coremag.cxx,v 1.6 2008/07/25 18:35:42 ehofman Exp $
->>>>>>> 1.6
 
 
 #include <stdio.h>
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\sample_openal.cxx Simgear\simgear\sound\sample_openal.cxx
--- C:\FGCVS\SimGear\source\simgear\sound\sample_openal.cxx	Mon Dec 22 21:23:37 2008
+++ Simgear\simgear\sound\sample_openal.cxx	Fri Mar 13 16:06:08 2009
@@ -24,16 +24,6 @@
 #  include <simgear_config.h>
 #endif
 
-#if defined( __APPLE__ )
-# define AL_ILLEGAL_ENUM AL_INVALID_ENUM
-# define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
-# include <OpenAL/al.h>
-# include <OpenAL/alut.h>
-#else
-# include <AL/al.h>
-# include <AL/alut.h>
-#endif
-
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/exception.hxx>
@@ -136,6 +126,7 @@
   }
 
 #else
+    .error Pre alut 1.0 version NOT supported
         //
 	// pre 1.0 alut version
         //
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\sample_openal.hxx Simgear\simgear\sound\sample_openal.hxx
--- C:\FGCVS\SimGear\source\simgear\sound\sample_openal.hxx	Fri Oct 31 16:14:15 2008
+++ Simgear\simgear\sound\sample_openal.hxx	Fri Mar 13 16:07:18 2009
@@ -48,7 +48,11 @@
 # include <OpenAL/al.h>
 # include <OpenAL/alut.h>
 #else
+#ifdef USE_OPENAL_SDK
+# include <al.h>
+#else
 # include <AL/al.h>
+#endif
 # include <AL/alut.h>
 #endif
 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.cxx Simgear\simgear\sound\soundmgr_openal.cxx
--- C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.cxx	Wed Sep 10 12:29:08 2008
+++ Simgear\simgear\sound\soundmgr_openal.cxx	Fri Mar 13 16:07:38 2009
@@ -29,14 +29,6 @@
 
 #include <simgear/compiler.h>
 
-#if defined(__APPLE__)
-# include <OpenAL/al.h>
-# include <OpenAL/alc.h>
-#else
-# include <AL/al.h>
-# include <AL/alc.h>
-#endif
-
 #if defined (__APPLE__)
 #  ifdef __GNUC__
 #    if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.hxx Simgear\simgear\sound\soundmgr_openal.hxx
--- C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.hxx	Fri Oct 31 16:14:15 2008
+++ Simgear\simgear\sound\soundmgr_openal.hxx	Fri Mar 13 16:09:00 2009
@@ -42,14 +42,6 @@
 #include <string>
 #include <map>
 
-#if defined( __APPLE__ )
-# include <OpenAL/al.h>
-# include <OpenAL/alc.h>
-#else
-# include <AL/al.h>
-# include <AL/alc.h>
-#endif
-
 #include "sample_openal.hxx"
 
 using std::map;
#END ==================================================================== 
#BEGIN alut 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\freealut-1.1.0-src alut 
#DIFF ==================================================================== 
#END ==================================================================== 
#BEGIN lpng 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\lpng1232 lpng 
#DIFF ==================================================================== 
#END ==================================================================== 
#BEGIN data\Input\Joysticks 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\FlightGear\data\Input\Joysticks data\Input\Joysticks 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\FlightGear\data\Input\Joysticks\Logitech\extreme-3d-pro.xml data\Input\Joysticks\Logitech\extreme-3d-pro.xml
--- C:\FGCVS\FlightGear\data\Input\Joysticks\Logitech\extreme-3d-pro.xml	Wed Mar 01 20:17:26 2006
+++ data\Input\Joysticks\Logitech\extreme-3d-pro.xml	Sat Jul 11 13:47:07 2009
@@ -30,6 +30,7 @@
  <name>Logitech Extreme 3D Pro</name>
  <name>Logitech Extreme 3D Pro USB</name>
  <name>Logitech  Extreme  3D  Pro USB</name>
+ <name>Logitech Extreme 3D</name>
 
  <axis n="0">
   <desc>Aileron</desc>
#END ==================================================================== 
