Changeset 580 for trunk

Timestamp:

Mar 18, 2008, 7:12:49 PM (14 years ago)

Author:

Peter Johansson

Message:

merge conflict left-over

File:

• trunk/NEWS (modified) (3 diffs)

trunk/NEWS

@@ -3 +3 @@
 See the end of this file for copyrights and conditions.
 
-<<<<<<< .working
 Version 0.7 (released DATE)
   - configure option --enable-wctests is removed (ticket:295)
@@ -11 +10 @@
   http://trac.thep.lu.se/svndigest/query?status=closed&milestone=0.7
 
-=======
 version 0.6.5 (released 18 March 2008)
   - Fixed color bug in blame output (ticket:278)
@@ -19 +17 @@
   http://trac.thep.lu.se/trac/svndigest/query?status=closed&milestone=0.6.5
 
->>>>>>> .merge-right.r578
 version 0.6.4 (released 14 October 2007)
   - fixed bug stats were double counted when root was a file (ticket:272)