Merge branch 'master' of git@git.scilab.org:scilab
Sylvestre Ledru [Thu, 27 Aug 2009 11:05:22 +0000 (13:05 +0200)]
Conflicts:
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in

1  2 
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj
scilab/modules/elementary_functions/src/fortran/linpack/wgefa.f

Simple merge
Simple merge
@@@ -116,11 -116,20 +116,21 @@@ src/fortran/slatec/dlngam.f 
  src/fortran/slatec/balanc.f
  
  LINPACK_SOURCES =    src/fortran/linpack/dgesl.f \
-    src/fortran/linpack/wpade.f \
-    src/fortran/linpack/wcopy.f \
-    src/fortran/linpack/dpofa.f \
-    src/fortran/linpack/util.f \
-    src/fortran/linpack/dgefa.f
+       src/fortran/linpack/wpade.f \
++      src/fortran/linpack/util.f \
+       src/fortran/linpack/wcopy.f \
+       src/fortran/linpack/dgefa.f \
+       src/fortran/linpack/dgbfa.f \
+       src/fortran/linpack/dgeco.f \
+       src/fortran/linpack/dgedi.f \
+       src/fortran/linpack/dqrdc.f \
+       src/fortran/linpack/dqrsl.f \
+       src/fortran/linpack/dqrsm.f \
+       src/fortran/linpack/hhdml.f \
+       src/fortran/linpack/spofa.f \
+       src/fortran/linpack/wgeco.f \
+       src/fortran/linpack/wgefa.f \
+       src/fortran/linpack/wgesl.f   
  
  ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \
  src/fortran/psi.f \
@@@ -834,11 -845,20 +844,21 @@@ src/fortran/slatec/dlngam.f 
  src/fortran/slatec/balanc.f
  
  LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
-    src/fortran/linpack/wpade.f \
-    src/fortran/linpack/wcopy.f \
-    src/fortran/linpack/dpofa.f \
-    src/fortran/linpack/util.f \
-    src/fortran/linpack/dgefa.f
+       src/fortran/linpack/wpade.f \
++      src/fortran/linpack/util.f \
+       src/fortran/linpack/wcopy.f \
+       src/fortran/linpack/dgefa.f \
+       src/fortran/linpack/dgbfa.f \
+       src/fortran/linpack/dgeco.f \
+       src/fortran/linpack/dgedi.f \
+       src/fortran/linpack/dqrdc.f \
+       src/fortran/linpack/dqrsl.f \
+       src/fortran/linpack/dqrsm.f \
+       src/fortran/linpack/hhdml.f \
+       src/fortran/linpack/spofa.f \
+       src/fortran/linpack/wgeco.f \
+       src/fortran/linpack/wgefa.f \
+       src/fortran/linpack/wgesl.f   
  
  ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \
  src/fortran/psi.f \