Changeset c876f29 for lib/libtrace.h.in


Ignore:
Timestamp:
02/05/19 09:50:43 (2 years ago)
Author:
Jacob Van Walraven <jcv9@…>
Branches:
develop
Children:
5e5b6ca
Parents:
db919d5 (diff), 1c3f8d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Resolve merge conflict attempt 2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace.h.in

    rdb919d5 rc876f29  
    414414       TRACE_TYPE_OPENBSD_LOOP = 20,    /**< OpenBSD loopback */
    415415       TRACE_TYPE_ERF_META = 21, /**< ERF Provenance metadata record */
    416        TRACE_TYPE_ETSILI = 22   /**< ETSI Lawful Intercept */
     416       TRACE_TYPE_ETSILI = 22,  /**< ETSI Lawful Intercept */
     417       TRACE_TYPE_PCAPNG_META = 23,     /** PCAPNG meta packet */
    417418} libtrace_linktype_t;
    418419
Note: See TracChangeset for help on using the changeset viewer.