[cig-commits] [commit] master: Merge branch 'read_events_hdf5' (72acee5)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/4a71dae87966b80bfee7c194773543359a343617...941b3d7e55983967dea392d12aeac9ce3998ca30

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

commit 72acee5c8c97ccbfa972212b45d42d0a820f7940
Merge: 653fcc8 761b5e2
Author: Kasey Schultz <kwschultz at ucdavis.edu>
Date:   Wed Jan 28 18:21:47 2015 -0800

    Merge branch 'read_events_hdf5'



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

72acee5c8c97ccbfa972212b45d42d0a820f7940
 examples/pyvq.py            | 174 +++++++++++---------------------------------
 quakelib/src/QuakeLibIO.cpp |  61 ++++++++--------
 quakelib/src/QuakeLibIO.h   |   6 ++
 src/io/GreensFileOutput.cpp |  25 +++++--
 src/io/HDF5Data.cpp         |  13 +++-
 5 files changed, 109 insertions(+), 170 deletions(-)