[cig-commits] [commit] master: Merge branch 'eheien_output_headers' into eheien_aftershock_mod (3c2b0c2)

[cig_noreply at geodynamics.org]

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

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

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

commit 3c2b0c28816b3230aa28d888641a27748ce85542
Merge: 57feef2 1022f40
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Sep 17 21:43:59 2014 -0700

    Merge branch 'eheien_output_headers' into eheien_aftershock_mod



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

3c2b0c28816b3230aa28d888641a27748ce85542
 quakelib/src/QuakeLib.h     |  4 ++--
 quakelib/src/QuakeLibIO.cpp |  2 +-
 src/io/EventOutput.cpp      | 26 ++++++++++++++++++++++++++
 src/io/EventOutput.h        |  6 ++++++
 4 files changed, 35 insertions(+), 3 deletions(-)