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

[dealii.demon at gmail.com]

Revision 2536

take over r2534

_U  branches/releases/aspect-1.0/
U   branches/releases/aspect-1.0/source/main.cc


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

Diff:
Index: branches/releases/aspect-1.0
===================================================================
--- branches/releases/aspect-1.0	2014-04-15 11:54:28 UTC (rev 2535)
+++ branches/releases/aspect-1.0	2014-04-15 11:58:42 UTC (rev 2536)

Property changes on: branches/releases/aspect-1.0
___________________________________________________________________
Modified: svn:mergeinfo
## -2,3 +2,4 ##
 /branches/compositional:1141-1251
 /branches/fully-nonlinear:542-728
 /branches/j-dannberg:1679,1875-1882
+/trunk/aspect:2534
\ No newline at end of property
Modified: branches/releases/aspect-1.0/source/main.cc
===================================================================
--- branches/releases/aspect-1.0/source/main.cc	2014-04-15 11:54:28 UTC (rev 2535)
+++ branches/releases/aspect-1.0/source/main.cc	2014-04-15 11:58:42 UTC (rev 2536)
@@ -176,7 +176,7 @@
           const int n_tasks = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD);
 
           std::cout << "-----------------------------------------------------------------------------
"
-                    << "-- This is ASPECT, the Advanced Simulator for Problems in Earth's ConvecTion.
"
+                    << "-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
"
 #ifdef DEBUG
                     << "--     . running in DEBUG mode
"
 #else