[cig-commits] [commit] master: Merge pull request #14 from QuLogic/build-stuff (35bd59c)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/specfem1d/compare/0474318db2f3c07f3ea053913eed9404264a153e...35bd59c099344f3bf7aa0e5570daa5ec1eca3c07

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

commit 35bd59c099344f3bf7aa0e5570daa5ec1eca3c07
Merge: 0474318 d4d879a
Author: Eric Heien <eheien at users.noreply.github.com>
Date:   Mon Jan 5 23:01:39 2015 -0800

    Merge pull request #14 from QuLogic/build-stuff
    
    Updated makefiles



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

35bd59c099344f3bf7aa0e5570daa5ec1eca3c07
 .gitignore                                         |   1 +
 Fortran_version/Makefile                           | 104 ++++++++-------------
 Fortran_version/README                             |   2 +-
 Fortran_version/{OUTPUT_FILES => obj}/.gitignore   |   0
 obj/.keep                                          |   0
 .../Makefile                                       |  70 ++++----------
 .../obj}/.gitignore                                |   0
 7 files changed, 60 insertions(+), 117 deletions(-)