Changeset 11527 for issm/trunk/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp

Timestamp:

02/24/12 08:12:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11526

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp (modified) (1 diff)

issm/trunk/src/c

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

issm/trunk/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp

@@ -126 +126 @@
         }
         if (debug && my_thread==0) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+        
+        return NULL;
 
 }

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*