Changeset 580


Ignore:
Timestamp:
Mar 18, 2008, 7:12:49 PM (13 years ago)
Author:
Peter Johansson
Message:

merge conflict left-over

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r579 r580  
    33See the end of this file for copyrights and conditions.
    44
    5 <<<<<<< .working
    65Version 0.7 (released DATE)
    76  - configure option --enable-wctests is removed (ticket:295)
     
    1110  http://trac.thep.lu.se/svndigest/query?status=closed&milestone=0.7
    1211
    13 =======
    1412version 0.6.5 (released 18 March 2008)
    1513  - Fixed color bug in blame output (ticket:278)
     
    1917  http://trac.thep.lu.se/trac/svndigest/query?status=closed&milestone=0.6.5
    2018
    21 >>>>>>> .merge-right.r578
    2219version 0.6.4 (released 14 October 2007)
    2320  - fixed bug stats were double counted when root was a file (ticket:272)
Note: See TracChangeset for help on using the changeset viewer.