[cig-commits] r4339 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Mesh/src

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:17:41 -0700 (Thu, 17 Aug 2006)
New Revision: 4339

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h
Log:
 r2714 at earth:  boo | 2006-08-17 17:14:24 -0700
  r2668 at earth (orig r3749):  LukeHodkinson | 2006-08-05 02:34:14 -0700
  Once again, I forgot to commit the makefile and header
  wrapper.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2713
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3748
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2714
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3749

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h	2006-08-18 00:17:39 UTC (rev 4338)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h	2006-08-18 00:17:41 UTC (rev 4339)
@@ -44,6 +44,7 @@
 	
 	#include "types.h"
 	#include "shortcuts.h"
+	#include "Decomp.h"
 	#include "ElementLayout.h"
 	#include "HexaEL.h"
 	#include "ParallelPipedHexaEL.h"
@@ -58,7 +59,6 @@
 	#include "MeshGeometry.h"
 	#include "MeshLayout.h"
 	#include "MeshClass.h"
-	#include "HMesh.h"
 	#include "ShadowInfo.h"
 	#include "Init.h"
 	#include "Finalise.h"