[Monotone-commits-diffs] Revision 3c2eb35aa52109f4981a877f62711071cc0924d3

[monotone]

-----------------------------------------------------------------
Revision: 3c2eb35aa52109f4981a877f62711071cc0924d3
Ancestor: 19f1efbc4490b7c08c8fb1656eb8208927485293
Ancestor: 1a4e462abfd464e50eac2e7cc73a4e91eff58621
Author: address@hidden
Date: 2007-08-19T10:23:53
Branch: net.venge.monotone.local-sockets

Renamed entries:
        sqlite/limits.h to sqlite/sqliteLimit.h
Modified files:
        Makefile.am NEWS cmd_netsync.cc database.cc lua/lcode.cc
        lua/ldebug.cc lua/lparser.cc lua/ltable.cc lua/lvm.cc
        m4/numeric_vocab.m4 netcmd.hh netsync.cc options_list.hh
        po/es.po po/sv.po project.cc project.hh revision.cc
        revision.hh sqlite/alter.c sqlite/analyze.c sqlite/btree.c
        sqlite/build.c sqlite/expr.c sqlite/func.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/loadext.c sqlite/main.c
        sqlite/malloc.c sqlite/opcodes.c sqlite/opcodes.h
        sqlite/os.h sqlite/os_common.h sqlite/os_os2.c
        sqlite/os_unix.c sqlite/pager.c sqlite/parse.c
        sqlite/pragma.c sqlite/prepare.c sqlite/printf.c
        sqlite/select.c sqlite/sqlite3.h sqlite/sqlite3ext.h
        sqlite/sqliteInt.h sqlite/sqliteLimit.h sqlite/tokenize.c
        sqlite/trigger.c sqlite/update.c sqlite/utf.c sqlite/util.c
        sqlite/vdbe.c sqlite/vdbeInt.h sqlite/vdbeapi.c
        sqlite/vdbeaux.c sqlite/vdbeblob.c sqlite/vdbemem.c
        sqlite/vtab.c sqlite/where.c std_hooks.lua
        tests/suspend/__driver__.lua

ChangeLog: 

explicit merge of '1a4e462abfd464e50eac2e7cc73a4e91eff58621'
              and '19f1efbc4490b7c08c8fb1656eb8208927485293'


monotone --db={your.database} diff 
--revision=19f1efbc4490b7c08c8fb1656eb8208927485293 
--revision=3c2eb35aa52109f4981a877f62711071cc0924d3
monotone --db={your.database} diff 
--revision=1a4e462abfd464e50eac2e7cc73a4e91eff58621 
--revision=3c2eb35aa52109f4981a877f62711071cc0924d3
----------------------------------------------------------------------