[cig-commits] [commit] master: Merge remote-tracking branch 'origin/master' (003ed77)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/calypso

On branch  : master
Link       : https://github.com/geodynamics/calypso/compare/2e2e23017e43f2886e7ff51e7893f9c96bdde10a...003ed772836ab80ffc66cfab02737f3ebabb8991

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

commit 003ed772836ab80ffc66cfab02737f3ebabb8991
Merge: 8667c02 2e2e230
Author: Hiroaki Matsui <h_kemono at mac.com>
Date:   Fri Mar 14 10:10:28 2014 -0700

    Merge remote-tracking branch 'origin/master'



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

003ed772836ab80ffc66cfab02737f3ebabb8991
 CMakeLists.txt | 1 -
 README         | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)