Changeset 30700 for branches/eam_branches/ipp-20110213/ippTools

Timestamp:

Feb 19, 2011, 10:28:40 AM (15 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20110213/ippTools

Files:

• share/camtool_find_pendingimfile.sql (modified) (1 prop)
• share/pxadmin_create_tables.sql (modified) (1 prop)
• src (modified) (1 prop)
• src/magicdstool.c (modified) (1 diff)
• src/magictool.c (modified) (1 prop)

branches/eam_branches/ipp-20110213/ippTools/src/magicdstool.c

@@ -771 +771 @@
         break;
     case IPP_STAGE_CAMERA:
-        psFree(query);
         query = NULL;
         clearRunQuery = "UPDATE chipBackgroundRun SET magicked = 0 where chip_bg_id = %" PRId64;