[Monotone-commits-diffs] Revision 67104f7c9be3829d36f28c27cfa7ccdd797da828

[monotone]

-----------------------------------------------------------------
Revision: 67104f7c9be3829d36f28c27cfa7ccdd797da828
Ancestor: 802d8fb57c34ed5c39c44ea4c76243148d638371
Ancestor: ede1c2f428b97262aeb6b15a5a027b4aee9f2a13
Author: address@hidden
Date: 2005-04-23T04:32:44
Branch: net.venge.monotone

Added files:
        tests/t_diff_currev.at
Modified files:
        ChangeLog contrib/monotone.el cryptopp/dll.cpp
        cryptopp/iterhash.h cryptopp/modarith.h cryptopp/modes.h
        cryptopp/osrng.cpp cryptopp/osrng.h cryptopp/strciphr.h
        monotone.texi tests/t_drop_attr.at testsuite.at work.cc

ChangeLog: 

explicit_merge of 802d8fb57c34ed5c39c44ea4c76243148d638371
              and ede1c2f428b97262aeb6b15a5a027b4aee9f2a13
   using ancestor 
        to branch 'net.venge.monotone'


monotone --db={your.database} diff 
--revision=802d8fb57c34ed5c39c44ea4c76243148d638371 
--revision=67104f7c9be3829d36f28c27cfa7ccdd797da828
monotone --db={your.database} diff 
--revision=ede1c2f428b97262aeb6b15a5a027b4aee9f2a13 
--revision=67104f7c9be3829d36f28c27cfa7ccdd797da828
----------------------------------------------------------------------