Changeset db919d5 for lib


Ignore:
Timestamp:
02/05/19 09:48:16 (20 months ago)
Author:
Jacob Van Walraven <jcv9@…>
Branches:
develop
Children:
c876f29
Parents:
692bf9c
Message:

Resolve merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace.h.in

    r692bf9c rdb919d5  
    346346        /** NULL passed misc **/
    347347        TRACE_ERR_NULL = -31,
     348        /** Err with trace output file **/
     349        TRACE_ERR_OUTPUT_FILE = -32,
    348350        /** ERR out of memory **/
    349351        TRACE_ERR_OUT_OF_MEMORY = -33,
Note: See TracChangeset for help on using the changeset viewer.