Changeset 9e429e8 for README


Ignore:
Timestamp:
09/19/14 15:40:01 (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:
11cf9b1
Parents:
d994324 (diff), ea602cd (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/master' into develop

Conflicts:

README
lib/format_dpdk.c
lib/format_linux.c
lib/trace.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • README

    r17c5749 r9e429e8  
    44Libtrace functions might not function correctly breaking the supplied tools.
    55
    6 libtrace 3.0.20
     6libtrace 3.0.21
    77
    88---------------------------------------------------------------------------
     
    1414---------------------------------------------------------------------------
    1515
     16See INSTALL for instructions on how to install libtrace.
    1617
    1718This directory contains source code for libtrace, a userspace library for
     
    2526Further information about libtrace see
    2627http://research.wand.net.nz/software/libtrace.php
    27 Bugs should be reported in trac at http://www.wand.net.nz/trac/libtrace
     28
     29Bugs should be reported by either emailing contact@wand.net.nz or filing
     30an issue at https://github.com/wanduow/libtrace
    2831
    2932It is licensed under the GNU General Public License (GPL) version 2. Please
     
    3134
    3235A detailed ChangeLog can be found on the libtrace wiki:
    33 https://secure.wand.net.nz/trac/libtrace/wiki/ChangeLog
     36https://github.com/wanduow/libtrace/wiki/ChangeLog
    3437
    3538Documentation, usage instructions and a detailed tutorial can also found
Note: See TracChangeset for help on using the changeset viewer.