From: mistachkin <mistachkin@noemail.net>
Date: Thu, 23 Aug 2012 22:45:34 +0000 (+0000)
Subject: Merge changes for the new sqlite3_win32_set_directory API to trunk.
X-Git-Tag: version-3.7.14~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=319a17071752651dfc41435f5cabcebe4e71172a;p=thirdparty%2Fsqlite.git

Merge changes for the new sqlite3_win32_set_directory API to trunk.

FossilOrigin-Name: 20f184f2d5908badd9d44d4fe2ad7c9e182c8803
---

319a17071752651dfc41435f5cabcebe4e71172a
diff --cc manifest
index 796283a32d,b66bb4b033..4671dd0433
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modify\sthe\sMSVC\smakefile\sto\smake\sit\seasier\sto\sselect\sthe\sheap\ssubsystem\sto\suse.
- D 2012-08-22T00:39:34.681
 -C Add\sassert\sto\scheck\sthat\sthe\smemory\sblock\sfor\sthe\sprevious\sdirectory\svalue\swas\sallocated\svia\ssqlite3_malloc\sor\srelated\sfunction.
 -D 2012-08-22T00:18:27.016
++C Merge\schanges\sfor\sthe\snew\ssqlite3_win32_set_directory\sAPI\sto\strunk.
++D 2012-08-23T22:45:34.016
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1011,7 -1011,7 +1011,7 @@@ F tool/vdbe-compress.tcl d70ea6d8a19e35
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 573770f5a66fa4d708931b30350149eb739da607
- R 37de98f91b94867b24c6cd4084658a36
 -P 600de08d40ceead24f425d20429d60f5732f8ba7
 -R 6c87c3e648e94de2b524ed53950bb61a
++P b1dbf490869d7fc55ce797cf80cf3bf7141d2d15 1246f15b146ebf6518fb8f5c92a1ebc9495cd9dc
++R 35479bceaf9a1b66b4c629b32ba58687
  U mistachkin
- Z 9fc3bc40456dded5ffdcfb8030fc95c3
 -Z f9a6c98c016742518046fb10cc8cbb02
++Z e3d10f82918ee1a10410c8802031890d
diff --cc manifest.uuid
index 3674ab90b9,e38016daa8..a717c97ba2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b1dbf490869d7fc55ce797cf80cf3bf7141d2d15
 -1246f15b146ebf6518fb8f5c92a1ebc9495cd9dc
++20f184f2d5908badd9d44d4fe2ad7c9e182c8803