Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/psconfig

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/tagsets/ipp-3.0.dist (modified) (1 diff)
• psconfig/tagsets/ipp-3.0.libs (modified) (1 diff)

branches/eam_branches/ps2-tc3-20130727/psconfig/tagsets/ipp-3.0.dist

@@ -64 +64 @@
   YYYYY  ippScripts             ipp-2-9          -0
   YYYYY  ippTasks               ipp-2-9          -0
-# YYYYY  ippToPsps              ipp-2-9          -0
+  NNYYN  ippToPsps              ipp-2-9          -0
           
   YYYYY  ippconfig              ipp-2-9          -0

branches/eam_branches/ps2-tc3-20130727/psconfig/tagsets/ipp-3.0.libs

@@ -34 +34 @@
 lib libpng               NONE           NONE   libpng-1.2.15.tar.gz     libpng-1.2.15    N NONE NONE NONE
 lib libjpeg              NONE           jpeg   jpegsrc.v8c.tar.gz       jpeg-8c          N --enable-shared NONE NONE
-lib libcfitsio           NONE           NONE   cfitsio3100-p4.tar.gz    cfitsio3100-p4   N --enable-shared shared,all NONE
+lib libcfitsio           NONE           NONE   cfitsio3100-p5.tar.gz    cfitsio3100-p5   N --enable-shared shared,all NONE
 lib libmysqlclient       NONE           mysql  mysql-5.0.51a.tar.gz     mysql-5.0.51a    N --with-unix-socket-path=/var/run/mysqld/mysqld.sock NONE NONE
 lib libgsl               NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         N NONE NONE NONE