[cig-commits] commit 2548 by heister to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2548

take over 2545 through 2547

_U  branches/releases/aspect-1.0/
U   branches/releases/aspect-1.0/doc/manual/manual.tex


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2548&peg=2548

Diff:
Index: branches/releases/aspect-1.0
===================================================================
--- branches/releases/aspect-1.0	2014-04-16 13:04:33 UTC (rev 2547)
+++ branches/releases/aspect-1.0	2014-04-16 13:06:31 UTC (rev 2548)

Property changes on: branches/releases/aspect-1.0
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/compositional:1141-1251
 /branches/fully-nonlinear:542-728
 /branches/j-dannberg:1679,1875-1882
-/trunk/aspect:2534,2537-2543
+/trunk/aspect:2534,2537-2543,2546-2547
\ No newline at end of property
Modified: branches/releases/aspect-1.0/doc/manual/manual.tex
===================================================================
--- branches/releases/aspect-1.0/doc/manual/manual.tex	2014-04-16 13:04:33 UTC (rev 2547)
+++ branches/releases/aspect-1.0/doc/manual/manual.tex	2014-04-16 13:06:31 UTC (rev 2548)
@@ -81,12 +81,15 @@
     Juliane Dannberg,
     Ren{\'e} Ga{\ss}m{\"o}ller,
     Thomas Geenen,
+    Ryan Grove,\
     Eric Heien,
     Martin Kronbichler,
     Elvira Mulyukova,
-    Cedric Thieulot
+    Ian Rose,
+    Cedric Thieulot\
 }
 
+{ontfamily{\sfdefault}\selectfont \href{http://geodynamics.org}{geodynamics.org}}
 
 
 \pagebreak