[Monotone-commits-diffs] Revision 530f1c944138e6ff09059e6c05d851fd67331a3a

[monotone]

-----------------------------------------------------------------
Revision: 530f1c944138e6ff09059e6c05d851fd67331a3a
Ancestor: 96290c31aa9ef0618680910ad3fd46cddd975b13
Ancestor: c5902cab7899f71f9f8eee23e3952593ca2cb6ed
Author: address@hidden
Date: 2008-02-25T23:18:40
Branch: net.venge.monotone

Deleted entries:
        botan/es_file.cpp botan/es_file.h botan/inifile.cpp
Added files:
        botan/es_dev.cpp botan/es_dev.h char_classifiers.hh
Modified files:
        Makefile.am NEWS basic_io.cc basic_io.hh
        botan/README.botan-monotone botan/aes.cpp botan/allocate.h
        botan/asn1_alt.cpp botan/asn1_ku.cpp botan/asn1_obj.h
        botan/ber_dec.cpp botan/big_base.cpp botan/big_ops2.cpp
        botan/bit_ops.cpp botan/bit_ops.h botan/buf_es.cpp
        botan/build.h botan/crc32.cpp botan/credits.txt
        botan/defalloc.cpp botan/defalloc.h botan/der_enc.cpp
        botan/des.cpp botan/dsa_gen.cpp botan/es_egd.cpp
        botan/hex.cpp botan/init.h botan/init_def.cpp
        botan/init_opt.cpp botan/kdf.cpp botan/libstate.cpp
        botan/mdx_hash.cpp botan/mem_pool.cpp botan/mgf1.cpp
        botan/modules.cpp botan/mp_mul.cpp botan/parsing.cpp
        botan/parsing.h botan/pkcs5.cpp botan/policy.cpp
        botan/prf_x942.cpp botan/pubkey.cpp botan/randpool.cpp
        botan/reducer.cpp botan/sha160.cpp botan/sha256.cpp
        botan/x509cert.cpp botan/x509self.cpp botan/x509self.h
        database.hh gzip.cc key_store.hh keys.hh lua.cc packet.cc
        packet.hh rcs_file.cc rcs_import.cc revision.cc
        transforms.cc vocab.cc vocab.hh

ChangeLog: 

merge of '96290c31aa9ef0618680910ad3fd46cddd975b13'
     and 'c5902cab7899f71f9f8eee23e3952593ca2cb6ed'


monotone --db={your.database} diff 
--revision=96290c31aa9ef0618680910ad3fd46cddd975b13 
--revision=530f1c944138e6ff09059e6c05d851fd67331a3a
monotone --db={your.database} diff 
--revision=c5902cab7899f71f9f8eee23e3952593ca2cb6ed 
--revision=530f1c944138e6ff09059e6c05d851fd67331a3a
----------------------------------------------------------------------