From: drh <drh@noemail.net>
Date: Wed, 14 Dec 2011 18:28:18 +0000 (+0000)
Subject: Merge the VFSNAME file-control addition into the nx-devkit branch.
X-Git-Tag: version-3.7.10~19^2~57^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f2ab8db33f82743ea49b5b11e5f10a8923ed6fb;p=thirdparty%2Fsqlite.git

Merge the VFSNAME file-control addition into the nx-devkit branch.

FossilOrigin-Name: 08c1dc517c1340737a55ad9012b7b06f72899c6f
---

0f2ab8db33f82743ea49b5b11e5f10a8923ed6fb
diff --cc manifest
index 03d497d4df,a798047867..e9459b2243
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improvements\sto\scomments.\s\sNo\scode\schanges.
- D 2011-12-14T01:38:12.485
 -C Add\sa\sfile-control\sthat\swill\sdiscover\sthe\sname\sof\sthe\sbottom-level\sVFS\sand\nall\sthe\sshims\sin\sbetween.
 -D 2011-12-14T17:53:36.239
++C Merge\sthe\sVFSNAME\sfile-control\saddition\sinto\sthe\snx-devkit\sbranch.
++D 2011-12-14T18:28:18.920
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -978,7 -978,10 +978,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 43a1264088c57bf598787b7a9f5d7a2536603d67
- R bccaf9dcf75a81906ae2a631899b3b9f
 -P 08bbbd8e38697908ab8ae0f6b512d01c32f7e4da
++P 08bbbd8e38697908ab8ae0f6b512d01c32f7e4da cdbfb553af02d10767a905489d9dfc57fc6be54e
+ R d213e3c5e90076919d50d6149e76976e
 -T *branch * vfsname-filectrl
 -T *sym-vfsname-filectrl *
 -T -sym-nx-devkit *
  U drh
- Z 311819ae6733da4a29af5f18337fa8de
 -Z 739c7a11bf4ddcfa0aa24a6fb0f05205
++Z 8e788ffb68fb72b933914781f94a7874
diff --cc manifest.uuid
index 38fadc9ea8,d2ab48f170..d03e81ee9a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 08bbbd8e38697908ab8ae0f6b512d01c32f7e4da
 -cdbfb553af02d10767a905489d9dfc57fc6be54e
++08c1dc517c1340737a55ad9012b7b06f72899c6f