Changeset 42803 for branches/eam_branches/ipp-ppmerge-20241229/psconfig

Timestamp:

May 7, 2025, 2:41:21 PM (15 months ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-ppmerge-20241229

Files:

• . (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/tagsets/ipp-ubuntu.dist (modified) (2 diffs)

branches/eam_branches/ipp-ppmerge-20241229/psconfig/tagsets/ipp-ubuntu.dist

@@ -68 +68 @@
   YYYYY  ippScripts             ipp-2-9          -0
   YYYYY  ippTasks               ipp-2-9          -0
-# YNYYY  ippToPsps              ipp-2-9          -0 : moved to $svn/psps
+  YNYYY  ippToPsps              ipp-2-9          -0 : moved to $svn/psps
           
   YNYYN  psconfig               ipp-2-9          -0
@@ -81 +81 @@
 
   YYYYY  extsrc/gpcsw           ipp-2-9          -0
-# YYYYY  magic                  ipp-2-9          -0
-# YYYYY  magic/censorObjects    ipp-2-9          -0
-# YYYYY  magic/remove           ipp-2-9          -0
-  YYYYY  console                ipp-2-9          -0
+  YNYYY  magic                  ipp-2-9          -0
+  YNYYY  magic/censorObjects    ipp-2-9          -0
+  YNYYY  magic/remove           ipp-2-9          -0
+  YNYYY  console                ipp-2-9          -0
 
 # there are externally required C libraries and perl modules (see INSTALL)