Changeset 33949 for branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.dvodb.dat

Timestamp:

May 29, 2012, 5:08:07 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/ippMonitor

Files:

• . (modified) (1 prop)
• raw/ipp.dvodb.dat (modified) (1 diff)

branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.dvodb.dat

@@ -9 +9 @@
              
 menulink  | menuselect   | link    | minidvodbRun              | minidvodbRun.php
-menulink  | menuselect   | link    | minidvodbProcessed         | minidvodbProcessed.php            
+menulink  | menuselect   | link    | minidvodbProcessed         | minidvodbProcessed.php    
 menulink  | menuselect   | link    | minidvodbCopy               | minidvodbCopy.php            
 
+menutop   | menutop      | plain   |     |
+
+menulink  | menuselect   | link    | mergedvodbRun              | mergedvodbRun.php
+menulink  | menuselect   | link    | mergedvodbProcessed         | mergedvodbProcessed.php    
+menulink  | menuselect   | link    | mergedvodbCopy               | mergedvodbCopy.php            
+
+menutop   | menutop      | plain   |     |
+
+menulink  | menuselect   | link    | dvodbStatus               | dvodbStatus.php
+menulink  | menuselect   | link    | dvodbFaulted               | dvodbFaulted.php            
+menulink  | menuselect   | link    | addRun Summary        | addRunSummary.php