[cig-commits] [commit] devel: Merge pull request #12 from geodynamics/master (72dba5d)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem1d/compare/2a1e1e152d522a08c928e44c12a09edaf49cfdeb...72dba5dd1e14fcce5e16e18f1436a8422bfced24

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

commit 72dba5dd1e14fcce5e16e18f1436a8422bfced24
Merge: 2a1e1e1 eb5c773
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Sat Dec 13 13:07:10 2014 +0100

    Merge pull request #12 from geodynamics/master
    
    merge Master into Devel



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

72dba5dd1e14fcce5e16e18f1436a8422bfced24
 .gitignore | 11 +++++++++++
 obj/.keep  |  0
 2 files changed, 11 insertions(+)