User: hinder Date: 2014/01/14 07:33 AM
Modified: /branches/proposed/ einsteintoolkit.th
Log: Merge remote-tracking branch 'origin/trunk' into proposed
Conflicts: einsteintoolkit.th
Directory Changes:
Directory: /branches/proposed/ ==============================
Property changes on: branches/proposed ___________________________________________________________________ Directory: /svn:mergeinfo/ ==========================
- /trunk:208-209,211-228,230-235,238,241-243,245,247-251,254-259
+ /trunk:208-209,211-228,230-235,238,241-243,245,247-251,254-259,262-265
File Changes:
Directory: /branches/proposed/ ==============================
File [modified]: einsteintoolkit.th Delta lines: +0 -4 =================================================================== --- branches/proposed/einsteintoolkit.th 2014-01-14 04:06:48 UTC (rev 267) +++ branches/proposed/einsteintoolkit.th 2014-01-14 13:33:55 UTC (rev 268) @@ -91,8 +91,6 @@ !AUTH_URL = https://svn.cactuscode.org/arrangements/$1/$2/trunk !URL = http://svn.cactuscode.org/arrangements/$1/$2/trunk !CHECKOUT = -CactusArchive/ADM # deprecated - CactusBase/Boundary CactusBase/CartGrid3D CactusBase/CoordBase @@ -232,7 +230,6 @@ EinsteinEOS/EOS_Polytrope
EinsteinEvolve/GRHydro -EinsteinEvolve/LegoExcision EinsteinEvolve/NewRad
EinsteinInitialData/DistortedBHIVP @@ -456,7 +453,6 @@ CTGamma/CartesianCoordinates CTGamma/Psiclops
- # Private thorns !TARGET = $ARR !TYPE = ignore