[Monotone-commits-diffs] Revision c86044e382c8b0d2d63e5b5a1f9cbbc632769c37

[monotone]

-----------------------------------------------------------------
Revision: c86044e382c8b0d2d63e5b5a1f9cbbc632769c37
Ancestor: 879f01b2f036900f13c9be68eaecddc8d49fd91e
Ancestor: bc71f5e6e472a9a3b53fd4bb2b5cc696bd4c6cbb
Author: Timothy Brownawell  <address@hidden>
Date: 2006-05-22T10:41:32
Branch: net.venge.monotone

Added files:
        vocab_macros.hh
Modified files:
        ChangeLog Makefile.am automate.cc basic_io.cc basic_io.hh
        cert.cc cert.hh cmd_list.cc cmd_netsync.cc commands.cc
        cset.cc database_check.cc keys.cc keys.hh legacy.cc
        legacy.hh lua_hooks.hh packet.cc paths.hh revision.cc
        roster.cc vocab.cc vocab.hh vocab_terms.hh

ChangeLog: 

merge of 879f01b2f036900f13c9be68eaecddc8d49fd91e
     and bc71f5e6e472a9a3b53fd4bb2b5cc696bd4c6cbb


monotone --db={your.database} diff 
--revision=879f01b2f036900f13c9be68eaecddc8d49fd91e 
--revision=c86044e382c8b0d2d63e5b5a1f9cbbc632769c37
monotone --db={your.database} diff 
--revision=bc71f5e6e472a9a3b53fd4bb2b5cc696bd4c6cbb 
--revision=c86044e382c8b0d2d63e5b5a1f9cbbc632769c37
----------------------------------------------------------------------