[Monotone-commits-diffs] Revision 747ad88bff30172a8998027b60c8414b1d956991

[monotone]

-----------------------------------------------------------------
Revision: 747ad88bff30172a8998027b60c8414b1d956991
Ancestor: 8a5775bccf0cca60b0a38837f2f17c4527407dbd
Ancestor: b681567666b15cf3c651d17a623b6b1cf9d175dd
Author: address@hidden
Date: 2006-02-19T23:13:16
Branch: net.venge.monotone

Modified files:
        ChangeLog cset.cc cset.hh roster.cc roster.hh
        roster_merge.cc tests/t_netsync_permissions.at testsuite.at
        work.cc work.hh

ChangeLog: 

merge of 8a5775bccf0cca60b0a38837f2f17c4527407dbd
     and b681567666b15cf3c651d17a623b6b1cf9d175dd


monotone --db={your.database} diff 
--revision=8a5775bccf0cca60b0a38837f2f17c4527407dbd 
--revision=747ad88bff30172a8998027b60c8414b1d956991
monotone --db={your.database} diff 
--revision=b681567666b15cf3c651d17a623b6b1cf9d175dd 
--revision=747ad88bff30172a8998027b60c8414b1d956991
----------------------------------------------------------------------