[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/sw4 (afc1155)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/sw4/compare/d5da240a9d8092ed6aaf96656a305fa284076d53...afc11559354312155d41cd8c298156b3ef67f947

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

commit afc11559354312155d41cd8c298156b3ef67f947
Merge: e9b2bb0 d5da240
Author: Bjorn Sjogreen <sjogreen2 at llnl.gov>
Date:   Tue Jan 27 15:56:18 2015 -0800

    Merge branch 'master' of https://github.com/geodynamics/sw4



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

afc11559354312155d41cd8c298156b3ef67f947
 examples/rfile/berkeley-r.in  |   4 +-
 examples/rfile/berkeley-r.out | 149 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+), 2 deletions(-)