Changeset 11237 for issm/trunk/externalpackages/petsc

Timestamp:

01/27/12 08:19:58 (14 years ago)

Author:

Eric.Larour

Message:

merged trunk-jpl and trunk for revision 11236

Location:

issm/trunk

Files:

• . (modified) (2 props)
• externalpackages/petsc (modified) (1 prop)
• externalpackages/petsc/configs (deleted)
• externalpackages/petsc/ex-petsc.txt (deleted)
• externalpackages/petsc/install-2.3.2-altix64-castor.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-altix64-castor.sh )
• externalpackages/petsc/install-2.3.2-cosmos.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-cosmos.sh )
• externalpackages/petsc/install-2.3.2-linux64-astrid.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh )
• externalpackages/petsc/install-2.3.2-macosx32-eric.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh )
• externalpackages/petsc/install-2.3.2-macosx32-ogive.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh )
• externalpackages/petsc/install-2.3.2-pleiades.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-pleiades.sh )
• externalpackages/petsc/install-2.3.2-win32-eric.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win32-eric.sh )
• externalpackages/petsc/install-3.1-altix64-castor.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.1-altix64-castor.sh )
• externalpackages/petsc/install-3.1-cosmos.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.1-cosmos.sh )
• externalpackages/petsc/install-3.1-linux64-astrid.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh )
• externalpackages/petsc/install-3.1-macosx32-mathieu.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh )
• externalpackages/petsc/install-3.1-macosx32-ogive.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh )
• externalpackages/petsc/install-3.1-pleiades.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.1-pleiades.sh )
• externalpackages/petsc/install-3.2-linux64.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh )
• externalpackages/petsc/install-3.2-macosx64.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh )
• externalpackages/petsc/install-3.2-pleiades.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.2-pleiades.sh )
• externalpackages/petsc/install.sh (deleted)

issm/trunk

@@ +1 @@
+autom4te.cache
+aclocal.m4
 bin
+config.log
+config.h
+config.h.in
+config.status
 configure
+doxygen
+ISSM.paf
+ISSM.ppf
+ISSM.ppf_cache
+libtool
+list
 Makefile
 Makefile.in
-ISSM.paf
-list
-ISSM.ppf_cache
-config.log
-config.h
-.ignore.txt
-config.status
 stamp-h1
 svn-commit*
-ISSM.ppf
-config.h.in
-autom4te.cache
-aclocal.m4
-doxygen

@@ +1 @@
+autom4te.cache
+aclocal.m4
 bin
+config.log
+config.h
+config.h.in
+config.status
 configure
+doxygen
+ISSM.paf
+ISSM.ppf
+ISSM.ppf_cache
+libtool
+list
 Makefile
 Makefile.in
-ISSM.paf
-list
-ISSM.ppf_cache
-config.log
-config.h
-.ignore.txt
-config.status
 stamp-h1
 svn-commit*
-ISSM.ppf
-config.h.in
-autom4te.cache
-aclocal.m4
-doxygen

issm/trunk/externalpackages/petsc

@@ -1 @@
-install*
+install
 src
-configure.sh
-.ignore.txt

@@ -1 @@
-install*
+install
 src
-configure.sh
-.ignore.txt

@@ +1 @@
+autom4te.cache
+aclocal.m4
 bin
+config.log
+config.h
+config.h.in
+config.status
 configure
+doxygen
+ISSM.paf
+ISSM.ppf
+ISSM.ppf_cache
+libtool
+list
 Makefile
 Makefile.in
-ISSM.paf
-list
-ISSM.ppf_cache
-config.log
-config.h
-.ignore.txt
-config.status
 stamp-h1
 svn-commit*
-ISSM.ppf
-config.h.in
-autom4te.cache
-aclocal.m4
-doxygen

@@ -1 @@
-install*
+install
 src
-configure.sh
-.ignore.txt