[cig-commits] [commit] master: Merge pull request #15 from eheien/master (e91e7f3)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/627c49b411aa261c79dbf807e71173eb9e5b1317...e91e7f3a67d22391a31bcfa9ff881ef8097ad787

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

commit e91e7f3a67d22391a31bcfa9ff881ef8097ad787
Merge: 627c49b 3b3d5a6
Author: Eric Heien <eheien at users.noreply.github.com>
Date:   Wed Oct 15 14:18:30 2014 -0700

    Merge pull request #15 from eheien/master
    
    astyle cleanup



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

e91e7f3a67d22391a31bcfa9ff881ef8097ad787
 quakelib/src/QuakeLibIO.cpp    |   4 +-
 quakelib/src/QuakeLibOkada.cpp | 111 +++++++++++++++++++++++++----------------
 quakelib/src/QuakeLibOkada.h   |   0
 src/core/VCSimulation.cpp      |   4 +-
 src/simulation/RunEvent.cpp    |   2 +
 5 files changed, 75 insertions(+), 46 deletions(-)