Changeset 8976 for code/branches

Timestamp:

Dec 14, 2011, 1:50:57 PM (13 years ago)

Author:

smerkli

Message:

Merged environment3 branch.

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• data/levels/asteroidField.oxw (copied) (copied from code/branches/environment3/data/levels/asteroidField.oxw)
• data/levels/includes/asteroidField.lua (copied) (copied from code/branches/environment3/data/levels/includes/asteroidField.lua)
• src/libraries/util/SignalHandler.cc (modified) (3 diffs)

code/branches/presentation2011/src/libraries/util/SignalHandler.cc

@@ -70 +70 @@
 
       catchSignal( SIGSEGV );
-      catchSignal( SIGABRT );
+      catchSignal( SIGABRT );  
       catchSignal( SIGILL );
     }
@@ -675 +675 @@
 
     /// Returns a description of the given exception.
-    // Based on code from Dr. Mingw by José Fonseca
+    // Based on code from Dr. Mingw by Jos\E9 Fonseca
     /* static */ std::string SignalHandler::getExceptionType(PEXCEPTION_POINTERS pExceptionInfo)
     {
@@ -745 +745 @@
 
     /// Retrieves the base address of the module that contains the specified address.
-    // Code from Dr. Mingw by José Fonseca
+    // Code from Dr. Mingw by Jos\E9 Fonseca
     /* static */ DWORD SignalHandler::getModuleBase(DWORD dwAddress)
     {