[cig-commits] [commit] aspect-1.2: release task: update version info (24882a3)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : aspect-1.2
Link       : https://github.com/geodynamics/aspect/compare/0000000000000000000000000000000000000000...8c1e1e978a72b986edd943b49cf75067db3bca79

>---------------------------------------------------------------

commit 24882a3a1f55ae8da64eb052f32f234309275ca8
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Jan 23 12:37:57 2015 -0500

    release task: update version info


>---------------------------------------------------------------

24882a3a1f55ae8da64eb052f32f234309275ca8
 VERSION                 | 2 +-
 doc/manual/manual.tex   | 2 +-
 include/aspect/global.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 5742032..5625e59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.pre
+1.2
diff --git a/doc/manual/manual.tex b/doc/manual/manual.tex
index c7116c0..f3fae75 100644
--- a/doc/manual/manual.tex
+++ b/doc/manual/manual.tex
@@ -125,7 +125,7 @@ COMPUTATIONAL INFRASTRUCTURE FOR GEODYNAMICS (CIG)
 % e.g. 1.0
 \raggedleft \huge \fontfamily{\sfdefault}\selectfont Version
 % keep the following line as is so that we can replace this using a script:
-1.2.pre %VERSION-INFO%
+1.2 %VERSION-INFO%
 \\\large(generated \today)\\}
 
 %AUTHOR(S) & WEBSITE%
diff --git a/include/aspect/global.h b/include/aspect/global.h
index 79effb1..a1830db 100644
--- a/include/aspect/global.h
+++ b/include/aspect/global.h
@@ -201,7 +201,7 @@ void print_aspect_header(Stream &stream)
 
   stream << "-----------------------------------------------------------------------------\n"
          << "-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.\n"
-         << "--     . version 1.2.pre\n" //VERSION-INFO. Do not edit by hand.
+         << "--     . version 1.2\n" //VERSION-INFO. Do not edit by hand.
 #ifdef DEBUG
          << "--     . running in DEBUG mode\n"
 #else