[Monotone-commits-diffs] Revision 491e8c9da64e0250406397d3339bc217f408a21a

[monotone]

-----------------------------------------------------------------
Revision: 491e8c9da64e0250406397d3339bc217f408a21a
Ancestor: 9f837f8595f86d8f2043a9c0b68fb431f0b675db
Ancestor: b367c1738bca985242c9a0eb9586c1126729278f
Author: address@hidden
Author: address@hidden
Date: 2006-02-19T13:22:49
Date: 2006-02-19T19:23:16
Branch: net.venge.monotone

Modified files:
        ChangeLog cset.cc cset.hh roster.cc roster.hh
        roster_merge.cc roster_merge.hh work.cc work.hh

ChangeLog: 

merge of 9f837f8595f86d8f2043a9c0b68fb431f0b675db
     and b367c1738bca985242c9a0eb9586c1126729278f


monotone --db={your.database} diff 
--revision=9f837f8595f86d8f2043a9c0b68fb431f0b675db 
--revision=491e8c9da64e0250406397d3339bc217f408a21a
monotone --db={your.database} diff 
--revision=b367c1738bca985242c9a0eb9586c1126729278f 
--revision=491e8c9da64e0250406397d3339bc217f408a21a
----------------------------------------------------------------------