SHA1 Hash:	1c2d878d12ee5ffb9f36a01ac69ed693a7dd39dc
Date:	2009-12-13 01:16:13
User:	btheado
Comment:	Merge with trunk
Timelines:	ancestors | descendants | both | sql-func
Other Links:	files | ZIP archive | manifest

• branch=sql-func inherited from [f41358e7ca]
• sym-sql-func inherited from [f41358e7ca]

Modified BUILD.txt from [334b80c575] to [4f7988767e].    [diff]

Modified Makefile from [c357142045] to [21a564c8f5].    [diff]

Modified Makefile.w32 from [900e354562] to [a8929670d9].    [diff]

Modified src/add.c from [c094792c50] to [d5685d9fd3].    [diff]

Modified src/branch.c from [3ef4b504fa] to [80adbdb5e4].    [diff]

Modified src/checkin.c from [b32786b578] to [c1819242e8].    [diff]

Modified src/db.c from [afc733b37d] to [6a9e0f8839].    [diff]

Modified src/login.c from [3b52c138db] to [646f690c52].    [diff]

Modified src/rebuild.c from [fa901199b7] to [ab6ed5de1a].    [diff]

Modified src/rss.c from [945efe289e] to [cc90868801].    [diff]

Modified src/setup.c from [41b6907a33] to [800f3104a6].    [diff]

Modified src/sqlite3.c from [9b458b28f3] to [bc27f16f36].    [diff]

Modified src/sqlite3.h from [260f444797] to [99a4282d9b].    [diff]

Modified src/style.c from [3c29836aa3] to [c7fc56d774].    [diff]

Modified src/update.c from [807405a4a8] to [74a2862e7d].    [diff]

Modified src/wiki.c from [c28c68f6a8] to [362c97b880].    [diff]

Modified src/wikiformat.c from [0e2f5af22b] to [b1603948aa].    [diff]