[Monotone-commits-diffs] Revision 975e746cce8666466056e089d7349613de75d4cb

[monotone]

-----------------------------------------------------------------
Revision: 975e746cce8666466056e089d7349613de75d4cb
Ancestor: 197f8471cd8db6c2f47b052abe21ec2a5f9c0099
Ancestor: dd4dc77cecc559c3d90818d27304fbf9505dbf32
Author: address@hidden
Date: 2005-10-08T19:40:20
Branch: net.venge.monotone

Deleted files:
        botan/base_eng.h botan/def_eng.cpp botan/dl_get.cpp
        botan/fips_rng.cpp botan/fips_rng.h botan/secalloc.h
        botan/x917_rng.cpp botan/x917_rng.h unix/platform_netsync.cc
        win32/platform_netsync.cc
Added files:
        botan/def_alg.cpp botan/def_mode.cpp botan/des.cpp
        botan/des.h botan/des_tab.cpp botan/pkcs5.cpp botan/pkcs5.h
        botan/sha256.cpp botan/sha256.h botan/x931_rng.cpp
        botan/x931_rng.h key_store.cc key_store.hh
        tests/t_add_inside_MT.at tests/t_automate_keys.at
        tests/t_key_management_without_db.at
Modified files:
        ChangeLog Makefile.am app_state.cc app_state.hh automate.cc
        basic_io.cc basic_io.hh botan/algolist.cpp botan/algolist.h
        botan/base.cpp botan/base.h botan/engine.h botan/init.cpp
        botan/mem_pool.cpp botan/mem_pool.h botan/mode_pad.h
        botan/pipe_rw.cpp botan/pkcs8.cpp botan/pkcs8.h
        botan/pubkey.cpp botan/pubkey.h botan/randpool.cpp
        botan/randpool.h botan/rng.cpp botan/sha160.cpp
        botan/sha160.h cert.cc cert.hh change_set.hh commands.cc
        contrib/ciabot_monotone.py database.cc database.hh
        file_io.cc file_io.hh keys.cc keys.hh lua.cc lua.hh main.cc
        monotone.cc monotone.texi netsync.cc options.hh packet.cc
        packet.hh paths.cc platform.hh sanity.cc schema.sql
        schema_migration.cc schema_migration.hh std_hooks.lua
        tests/t_cross.at tests/t_database_check_normalized.at
        tests/t_lua_privkey.at tests/t_migrate_schema.at
        tests/t_mt_ignore.at tests/t_netsync_absorbs.at
        tests/t_netsync_checks_server_key.at
        tests/t_netsync_permissions.at tests/t_netsync_pubkey.at
        tests/t_netsync_unrelated.at tests/t_short_opts.at
        tests/t_subdirs.at testsuite.at ui.cc unix/fs.cc vocab.cc
        vocab.hh vocab_terms.hh win32/fs.cc

ChangeLog: 

merge of 197f8471cd8db6c2f47b052abe21ec2a5f9c0099
     and dd4dc77cecc559c3d90818d27304fbf9505dbf32


monotone --db={your.database} diff 
--revision=197f8471cd8db6c2f47b052abe21ec2a5f9c0099 
--revision=975e746cce8666466056e089d7349613de75d4cb
monotone --db={your.database} diff 
--revision=dd4dc77cecc559c3d90818d27304fbf9505dbf32 
--revision=975e746cce8666466056e089d7349613de75d4cb
----------------------------------------------------------------------