[cig-commits] [commit] aspect-1.1: release task: update version info (962b567)

[cig_noreply at geodynamics.org]

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

On branch  : aspect-1.1
Link       : https://github.com/geodynamics/aspect/compare/dea94ae3fdac1f434e32718c384fe5ce83109802...db7eea299d721e7afa2dc72d8f42352dc88a9e16

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

commit 962b567c9ebfd4701f7ee02bfb9c9afbb93982cc
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 30 18:29:52 2014 -0400

    release task: update version info


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

962b567c9ebfd4701f7ee02bfb9c9afbb93982cc
 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..9459d4b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.pre
+1.1
diff --git a/doc/manual/manual.tex b/doc/manual/manual.tex
index c91fd0e..cc17ccb 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.1 %VERSION-INFO%
 \\\large(generated \today)\\}
 
 %AUTHOR(S) & WEBSITE%
diff --git a/include/aspect/global.h b/include/aspect/global.h
index 6cde988..b620183 100644
--- a/include/aspect/global.h
+++ b/include/aspect/global.h
@@ -187,7 +187,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.1\n" //VERSION-INFO. Do not edit by hand.
 #ifdef DEBUG
          << "--     . running in DEBUG mode\n"
 #else