Changeset 11684 for issm/branches/trunk-jpl-damage/src/c/modules/VecMergex/VecMergex.h

Timestamp:

03/12/12 14:40:42 (13 years ago)

Author:

cborstad

Message:

merged revisions 11428:11680 from trunk-jpl into branches/trunk-jpl-damage

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/VecMergex/VecMergex.h (modified) (1 diff)

issm/branches/trunk-jpl-damage/src/c/modules/VecMergex/VecMergex.h

@@ -10 +10 @@
 
 /* local prototypes: */
-void VecMergex(Vec ug, Vec uf, Nodes* nodes, Parameters* parameters, int SetEnum);
+void VecMergex(Vector* ug, Vector* uf, Nodes* nodes, Parameters* parameters, int SetEnum);
 
 #endif  /* _VECMERGEX_H */