[cig-commits] [commit] master: Merge pull request #261 from tjhei/version_bump (d8bdef0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/16c51416ab671466458d3c80fd33e77cd7c2e364...d8bdef0ba76855cb900fb83d7dd9b6c356992a3a

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

commit d8bdef0ba76855cb900fb83d7dd9b6c356992a3a
Merge: 16c5141 01c1fc2
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Jan 23 12:59:14 2015 -0500

    Merge pull request #261 from tjhei/version_bump
    
    release task: update version and changes.h



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

d8bdef0ba76855cb900fb83d7dd9b6c356992a3a
 VERSION                             |   2 +-
 doc/manual/manual.tex               |   2 +-
 doc/modules/changes.h               | 226 +-----------------------------------
 doc/modules/{changes.h => to-1.2.h} |   6 +-
 include/aspect/global.h             |   2 +-
 5 files changed, 8 insertions(+), 230 deletions(-)