[cig-commits] [commit] master: Merge branch 'master' of https://github.com/kwschultz/vq (653fcc8)

[cig_noreply at geodynamics.org]

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

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

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

commit 653fcc86164ccfe71f44b2f4d9b0a0bab2360298
Merge: 9d6f1b5 83a5400
Author: Kasey Schultz <kwschultz at ucdavis.edu>
Date:   Wed Jan 28 18:21:23 2015 -0800

    Merge branch 'master' of https://github.com/kwschultz/vq



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

653fcc86164ccfe71f44b2f4d9b0a0bab2360298
 examples/CMakeLists.txt     |  2 +-
 quakelib/src/QuakeLibIO.cpp | 45 +++++++++++++++++++++++++++------------------
 quakelib/src/QuakeLibIO.h   |  5 +++--
 src/io/GreensFileOutput.cpp | 12 +++++++-----
 src/mesher.cpp              | 17 +++++++++++++----
 5 files changed, 51 insertions(+), 30 deletions(-)