IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 30, 2008, 3:46:59 AM (18 years ago)
Author:
eugene
Message:

fix error with double definition (conflict merge error)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ippTools/src/faketoolConfig.c

    r18366 r18376  
    242242            "use the simple output format", false);
    243243
    244     // -pendingexp
    245     psMetadata *pendingexpArgs = psMetadataAlloc();
    246     psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0,
    247             "search by camtool ID", 0);
    248     psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0,
    249             "search by chiptool ID", 0);
    250     psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",  0,
    251             "limit result set to N items", 0);
    252     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0,
    253             "use the simple output format", false);
    254 
    255244    // -pendingimfile
    256245    psMetadata *pendingimfileArgs = psMetadataAlloc();
Note: See TracChangeset for help on using the changeset viewer.