Mercurial > p > roundup > code
diff CHANGES.txt @ 3146:7ca7407133b7 maint-0.8
merge from HEAD
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Sun, 13 Feb 2005 22:19:43 +0000 |
| parents | 60c7e0bf8874 |
| children | 0a652c47bc9e |
line wrap: on
line diff
--- a/CHANGES.txt Sun Feb 13 21:27:40 2005 +0000 +++ b/CHANGES.txt Sun Feb 13 22:19:43 2005 +0000 @@ -16,6 +16,7 @@ - code cleanup (sf patch 1115329 and additional) - issue search page allows setting of no sorting / grouping (sf bug 1119475) +- better edit conflict handling (sf bug 1118790) 2005-01-13 0.8.0b2