Changeset 0b01fea for lib/trace.c


Ignore:
Timestamp:
02/13/15 09:47:42 (7 years ago)
Author:
Richard Sanger <rsangerarj@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
4631115
Parents:
1b59edf (diff), 6cf3ca0 (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:

Merge branch 'ring_refactor' into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/trace.c

    r858ce90 r0b01fea  
    143143                legacy_constructor();
    144144                atmhdr_constructor();
     145                linuxring_constructor();
    145146                linuxnative_constructor();
    146147#ifdef HAVE_LIBPCAP
Note: See TracChangeset for help on using the changeset viewer.