From: dan <dan@noemail.net>
Date: Sat, 26 May 2012 18:42:21 +0000 (+0000)
Subject: Merge fts4-unicode branch with trunk.
X-Git-Tag: version-3.7.13~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=092a1ebd4c30606ea9ec3dec9b14f3d0b601ab05;p=thirdparty%2Fsqlite.git

Merge fts4-unicode branch with trunk.

FossilOrigin-Name: 25ba1f84f2b98d50ac1e2b9849b59ee902c2cca7
---

092a1ebd4c30606ea9ec3dec9b14f3d0b601ab05
diff --cc manifest
index a2de57fcf1,f3ca8b71f6..6b8c4fa0be
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Version\s3.7.12.1
- D 2012-05-22T02:45:53.459
 -C If\sSQLITE_DISABLE_FTS3_UNICODE\sis\sdefined,\sdo\snot\sbuild\sthe\s"unicode61"\stokenizer.
 -D 2012-05-26T18:28:14.350
++C Merge\sfts4-unicode\sbranch\swith\strunk.
++D 2012-05-26T18:42:21.996
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -998,10 -1004,7 +1004,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 5519cc5ef471e32a59995a34be811b46478dca1e
- R f9f0e59804fa7e60869ace7ace22bd3d
- T +bgcolor * #d0c0ff
- T +sym-release *
- T +sym-version-3.7.12.1 *
- U drh
- Z a30e57621f706278c1c64a3624297cbb
 -P b89d3834f6690073fca0fc22c18afa1fb280ea7d
++P 6d326d44fd1d626aae0e8456e5fa2049f1ce0789 e71495a817b479bc23c5403d99255e3f098eb054
+ R 721b18aaca6e897933f70f12a0639abb
+ U dan
 -Z f1ca3c8a69800dd8f2afaacbafb654ad
++Z ae28fe2fc4311d40e0d8bc0f1e62fc1e
diff --cc manifest.uuid
index ff54f427e8,ef8279ad4f..fb247993c9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6d326d44fd1d626aae0e8456e5fa2049f1ce0789
 -e71495a817b479bc23c5403d99255e3f098eb054
++25ba1f84f2b98d50ac1e2b9849b59ee902c2cca7