[cig-commits] [commit] master: Merge remote-tracking branch 'upstream/master' (18f2a2b)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04

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

commit 18f2a2b06904db55b650b574cad3e268e32c6789
Merge: 633b4a9 23464fc
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Oct 8 17:00:46 2014 -0700

    Merge remote-tracking branch 'upstream/master'
    
    Conflicts:
    	src/io/EventOutput.cpp
    	src/io/HDF5Data.cpp



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

18f2a2b06904db55b650b574cad3e268e32c6789
 quakelib/src/QuakeLibOkada.cpp | 138 +++++++++++++++++++++++++++++++++++++++++
 quakelib/src/QuakeLibOkada.h   |  23 +++++++
 2 files changed, 161 insertions(+)