Changeset 32338 for branches/eam_branches/ipp-20110710

Timestamp:

Sep 6, 2011, 11:00:55 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710

Files:

• dbconfig/README (copied) (copied from trunk/dbconfig/README )
• pstamp/scripts/pstampparse.pl (modified) (1 diff)
• psvideophot (modified) (1 prop)

branches/eam_branches/ipp-20110710/pstamp/scripts/pstampparse.pl

@@ -148 +148 @@
     } elsif ($lcname =~ /qub/) {
         $label = "QUB";
+        $label_changed = 1;
+    } elsif ($lcname =~ /pypstamp/) {
+        $label = "PY";
         $label_changed = 1;
     }