[Monotone-commits-diffs] Revision fd3ad856f37bc178808c93a1f4632fd3af18569b

[monotone]

-----------------------------------------------------------------
Revision: fd3ad856f37bc178808c93a1f4632fd3af18569b
Ancestor: c9448546265340dd3969f46308629ce0502340b1
Ancestor: f3f9c622058d4003415da0d0904bcf29deb9617e
Author: address@hidden
Date: 2005-07-05T09:36:23

Added files:
        globish.cc globish.hh hmac.cc hmac.hh sqlite/callback.c
        sqlite/prepare.c tests/t_cvsimport_drepper2.at
        tests/t_db_kill_branch_locally.at tests/t_existsonpath.at
        tests/t_netsync_globs.at
Modified files:
        AUTHORS ChangeLog INSTALL Makefile.am NEWS app_state.cc
        automate.cc basic_io.hh cert.cc change_set.cc commands.cc
        constants.cc constants.hh contrib/monotone-import.pl
        contrib/mtbrowse.sh cryptopp/config.h cryptopp/integer.cpp
        database.cc database.hh keys.cc keys.hh lua.cc lua.hh
        main.cc merkle_tree.cc merkle_tree.hh monotone.1 monotone.cc
        monotone.texi netcmd.cc netcmd.hh netsync.cc netsync.hh
        netxx/osutil.h packet.cc rcs_file.cc rcs_import.cc
        rcs_import.hh revision.cc sqlite/alter.c sqlite/btree.c
        sqlite/build.c sqlite/delete.c sqlite/expr.c sqlite/func.c
        sqlite/insert.c sqlite/keywordhash.h sqlite/main.c
        sqlite/opcodes.c sqlite/opcodes.h sqlite/os.h
        sqlite/os_unix.c sqlite/os_unix.h sqlite/os_win.c
        sqlite/pager.c sqlite/pager.h sqlite/parse.c sqlite/parse.h
        sqlite/pragma.c sqlite/random.c sqlite/select.c
        sqlite/sqlite3.h sqlite/sqliteInt.h sqlite/tokenize.c
        sqlite/trigger.c sqlite/update.c sqlite/util.c
        sqlite/vacuum.c sqlite/vdbe.c sqlite/vdbe.h sqlite/vdbeInt.h
        sqlite/vdbeapi.c sqlite/vdbeaux.c sqlite/vdbemem.c
        sqlite/where.c std_hooks.lua tests/t_automate_stdio.at
        tests/t_cvsimport_drepper.at tests/t_db_kill_rev_locally.at
        tests/t_netsync_defaults.at tests/t_netsync_permissions.at
        tests/t_netsync_single.at tests/t_selector_later_earlier.at
        testsuite.at transforms.cc transforms.hh unit_tests.cc
        unit_tests.hh unix/process.cc vocab.cc vocab_terms.hh

ChangeLog: 

explicit_merge of f3f9c622058d4003415da0d0904bcf29deb9617e
              and c9448546265340dd3969f46308629ce0502340b1
   using ancestor afa604dcb0f10c0d4bfec25e1dfef1fd4676df7e
        to branch 'net.venge.monotone.netsync-0.20'

txt59oB4TTdhO.txt
Description: Diff [c9448546265340dd3969f46308629ce0502340b1] -> [fd3ad856f37bc178808c93a1f4632fd3af18569b]

txtaLF2QMwWpw.txt
Description: Diff [f3f9c622058d4003415da0d0904bcf29deb9617e] -> [fd3ad856f37bc178808c93a1f4632fd3af18569b]