From: mistachkin <mistachkin@noemail.net>
Date: Sun, 7 Oct 2012 14:14:44 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce49cf9c0a3ab1d4921118524ce439f7b2202cc2;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: bbb0d189b7b6aecfc0e0b6c2bcd9f49aaea8c34a
---

ce49cf9c0a3ab1d4921118524ce439f7b2202cc2
diff --cc manifest
index 1ac13e51a7,6999191df1..68bf504834
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Corrections\sto\stest\snames\sto\seliminate\sduplicates\sand\sfollow\snaming\sconventions.
 -D 2012-10-07T05:34:39.472
 +C Merge\supdates\sfrom\strunk.
- D 2012-10-03T20:25:58.732
++D 2012-10-07T14:14:44.309
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -174,12 -174,12 +174,12 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 75c5e37cc882c468383c9d9e07496b9a16cfae3e
+ F src/select.c 2a82736faeca1fe93315eda20c691d68ec13bb6c
  F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
 -F src/sqlite.h.in c7be05ad191d2634292fcc77bdb2bcfa4526eb98
 +F src/sqlite.h.in 702c03d8036b6e0a5fac2fcb704d9df628e3d097
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 387103b56fba2992a2fdc50ec2eca7102a64066f
 -F src/sqliteInt.h 1c5c35cc835e4c4e26be43e663661a237db74c59
++F src/sqliteInt.h 57db1b9d5920725265e973a78549d7da25a57afe
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1018,7 -1019,7 +1019,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 9dc2eaa64b6a9f69bd6f3ff28de2c97682a69e0a ba2f492f957ab5556cd540e21a76ebb75efea725
- R 86a5cb8954b10d17bf99d382ffc699aa
 -P 4b0facc13b1026419f9b89dab3453ba43071455c
 -R 963a11ab0ec405d25d1ad37b4f26863a
++P 1138815c625a1a1721e0efdad6a5abca1e3c7299 50679889c75cd3205253b1682abfbddc5ff09175
++R 1818ef3d08c3896e49092a32e494ce2e
  U mistachkin
- Z 1397bb8f36c39363f3eac315e532cd6c
 -Z 2db2f94384e1edd2a3e02fd4f28955ba
++Z f699cfbfac79b2fe6b270f9f404921a4
diff --cc manifest.uuid
index c8dadc1be7,0d8ab7fd78..592a80ba6f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1138815c625a1a1721e0efdad6a5abca1e3c7299
 -50679889c75cd3205253b1682abfbddc5ff09175
++bbb0d189b7b6aecfc0e0b6c2bcd9f49aaea8c34a