Changeset 17c5749 for README


Ignore:
Timestamp:
07/22/14 12:57:50 (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:
41148f2
Parents:
54834a1 (diff), a6c77b0 (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 remote-tracking branch 'upsteam/develop' into FixingDPDK

Conflicts:

README
lib/format_linux.c
test/Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • README

    rf1015ad r17c5749  
    44Libtrace functions might not function correctly breaking the supplied tools.
    55
    6 libtrace 3.0.19
     6libtrace 3.0.20
    77
    88---------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.