From: drh <drh@noemail.net>
Date: Fri, 15 Nov 2013 19:00:20 +0000 (+0000)
Subject: Merge the operator comment fixes from trunk.
X-Git-Tag: version-3.8.2~84^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e2ea000b5acee48b6bfede67bdc6844cba38224;p=thirdparty%2Fsqlite.git

Merge the operator comment fixes from trunk.

FossilOrigin-Name: 9f14f55c8ab77e73dbffb7a9c99422bef14cc17a
---

8e2ea000b5acee48b6bfede67bdc6844cba38224
diff --cc manifest
index 461a040ced,a346bf8ac2..aaa37eeb63
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Changes\sto\smake\sthe\snew\sconstant\sexpression\sfactoring\slogic\smore\sgeneral\nand\smore\stestable.
- D 2013-11-15T18:15:19.953
 -C Fix\scomments\son\sthe\sOP_Divide\sand\sOP_Remainder\soperators,\sespecially\sthe\n"Synopsis:"\scomment,\sso\sthat\sthey\sagree\swith\sthe\sactual\simplementation.
 -D 2013-11-15T18:58:37.334
++C Merge\sthe\soperator\scomment\sfixes\sfrom\strunk.
++D 2013-11-15T19:00:20.523
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1139,7 -1139,7 +1139,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 79ec485b548fcfc508c4d5fa32ed0604e1b0c5d9
- R 81b3d4bed81861e7b07996884febd358
 -P 5960d11eba4fc6ca136331279689424d03bd6e76
 -R eeac4cc42ec89642fb7c3d8492dc346d
++P d10fb49a92f5f6e93093ae83544e5aec7984361a cc17f1f05f15e9c62659a49c0656ff2b667bf701
++R 5cbfa311a6440baa1aab3a14e0b86372
  U drh
- Z 2fbf2a6281b456f08de0df7e1fd4f785
 -Z cf9b95755a71f68840dd49a0488c3357
++Z 9cd1e63a69ab310f8ae9d30ed54eea9a
diff --cc manifest.uuid
index 6dae777ddd,479ceb1e91..2be76a8e59
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d10fb49a92f5f6e93093ae83544e5aec7984361a
 -cc17f1f05f15e9c62659a49c0656ff2b667bf701
++9f14f55c8ab77e73dbffb7a9c99422bef14cc17a