From: mistachkin <mistachkin@noemail.net>
Date: Sun, 10 Jul 2016 19:35:45 +0000 (+0000)
Subject: Merge comment typo fixes from trunk.
X-Git-Tag: version-3.15.0~110^2~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=709947a3153e89eac3fe3f1907002c4463e7d2fc;p=thirdparty%2Fsqlite.git

Merge comment typo fixes from trunk.

FossilOrigin-Name: 728c5aa436a5f55c86b019c415a2b71d1b0a8fd6
---

709947a3153e89eac3fe3f1907002c4463e7d2fc
diff --cc manifest
index b5d0802698,ad5811183a..43f53685aa
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\ssome\ssupport\sfor\susing\srow\svalue\sconstructors\sin\scertain\sparts\sof\sSQL\sexpressions.\sThere\sare\smany\sbugs\son\sthis\sbranch.
- D 2016-07-09T20:23:55.716
 -C Fix\stypos\sin\scomments.\s\sNo\schanges\sto\scode.
 -D 2016-07-10T19:35:10.288
++C Merge\scomment\stypo\sfixes\sfrom\strunk.
++D 2016-07-10T19:35:45.597
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -463,10 -463,10 +463,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
 -F src/where.c 48eed8ebe319c6cbc7bf7682018f32af0f5189f5
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 11e38f5e2dc5c007143fbf7fdb14bca40a6b74ad
 -F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
 +F src/where.c 898a45969bae1298cbaaaf05e6aeacfb45971293
 +F src/whereInt.h 1ad3be2a43cb821418e1100476a3a14cd57635c4
- F src/wherecode.c a66c589bdcaa9da45d9576d54663666083e0c109
++F src/wherecode.c 877ceb19cf00a5fd5aeea4e3ff633dcdf173f164
 +F src/whereexpr.c d88ee6ce356cb9fd986d0e81249a2cd66a513093
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1507,10 -1505,7 +1507,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P c869bf34a8ee42ac6542862e59c7a4b89b042f79
- R e70f91ca2d7d2c655198f54d385cd62e
- T *branch * rowvalue
- T *sym-rowvalue *
- T -sym-trunk *
- U dan
- Z e86f169a98e6cbe5718a428ba6e6f5e0
 -R e7b82c5fd816fe8e3d4680426d718eac
++P b2204215b231202aef7a218411cc2ddaecf28f35 77c692a6704cd877ba35d0afb774ab9b46364d59
++R 1a7620cc6269220b48a9fcbcbb9b68d1
+ U mistachkin
 -Z bc88f0dbd9511ddf1cf929c200555b61
++Z cf1dd7dc395b0586dda9fa40ccf71a27
diff --cc manifest.uuid
index 8f187444bd,d8458f4ae7..b148ca6043
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b2204215b231202aef7a218411cc2ddaecf28f35
 -77c692a6704cd877ba35d0afb774ab9b46364d59
++728c5aa436a5f55c86b019c415a2b71d1b0a8fd6