Changeset 4631115 for README


Ignore:
Timestamp:
02/13/15 13:23:34 (6 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:
de74f88
Parents:
0b01fea (diff), 92d5f15 (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 'master' into develop.

Update to include fixes/features etc from the 3.0.22 release.

Conflicts:

README
lib/format_dag25.c
lib/format_dpdk.c
lib/format_linux.c
lib/trace.c
test/Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • README

    r9e429e8 r4631115  
    44Libtrace functions might not function correctly breaking the supplied tools.
    55
    6 libtrace 3.0.21
     6libtrace 3.0.22
    77
    88---------------------------------------------------------------------------
    9 Copyright (c) 2007-2014 The University of Waikato, Hamilton, New Zealand.
     9Copyright (c) 2007-2015 The University of Waikato, Hamilton, New Zealand.
    1010All rights reserved.
    1111
Note: See TracChangeset for help on using the changeset viewer.