]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
A branch off of the sessions branch corresponding to release 3.7.14.
authordrh <drh@noemail.net>
Wed, 3 Oct 2012 18:20:02 +0000 (18:20 +0000)
committerdrh <drh@noemail.net>
Wed, 3 Oct 2012 18:20:02 +0000 (18:20 +0000)
FossilOrigin-Name: 86633e01fec2cbc00c749f6ef6ecda6acad2a82e

1  2 
Makefile.msc
manifest
manifest.uuid

diff --cc Makefile.msc
Simple merge
diff --cc manifest
index e332fe6cdfb8489dcbb705561ea44b72f9bcf1b1,033d6654a313fa57cdce234ba86074920a4d5106..58a7eadb35f31242f29e676577e9aeab12599329
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Update\swith\slatest\strunk\schanges.
- D 2012-08-31T14:23:16.346
 -C Version\s3.7.14
 -D 2012-09-03T15:42:36.217
++C A\sbranch\soff\sof\sthe\ssessions\sbranch\scorresponding\sto\srelease\s3.7.14.
++D 2012-10-03T18:20:02.748
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f153aec9a398d04df7a6dbd4ec092bf3f8edcad3
 -F Makefile.msc 2d696f01c228995e98b3b953a08b7bba1d48c130
++F Makefile.msc 2f3680c29a53135c2b45a5c9c5c5ee860ed1a34c
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@@ -190,9 -178,10 +190,10 @@@ F src/resolve.c 9e28280ec98035f31900fdd
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c f843c872a97baa1594c2cc3d4c003409a7bd03af
  F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261
 -F src/sqlite.h.in c447d35212736c4c77d86bc2d00f6cf4d4c12131
 +F src/sqlite.h.in 930b719ce295058817aa58e7b65c43dc668cc098
+ F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h 053e03a532beb909ead2df0721db67cdb4c48ae8
 +F src/sqliteInt.h 569cb02b6555db22dbe38566ed904f40f0ae5eb8
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1026,7 -1014,10 +1027,10 @@@ F tool/vdbe-compress.tcl d70ea6d8a19e35
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P aa62d6881b5aae64e15dbae70ce8e77bcc2a9f0b 527340abff18aedbcb0f82ac1296a9f548e24ac4
- R ce445dd99f7d73f4997bfaaffd71f58e
- U dan
- Z b7fa6fd6ef1ab9dd566a694a77a1f165
 -P ebb08d0b4d1ed674e4a23c3754206ca2df9063ff
 -R 8bdf9ef517616ac5a5043f12bec4acdb
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.7.14 *
++P 87995dc9409482f0a7a367bfc51d78ac0f63b8c3 c0d89d4a9752922f9e367362366efde4f1b06f2a
++R 324a519d6f898776b9a8c9b806b32640
++T *branch * sessions-3.7.14
++T *sym-sessions-3.7.14 *
++T -sym-sessions *
+ U drh
 -Z 126ab1aaea0f3a8cb5c4792cf0a82989
++Z 5c9e19dba4e39e94fc2ae70cd9d636ab
diff --cc manifest.uuid
index 56b257152ab290e692635040f1e45c3d407de287,05cc345a307f5b17172071cf618b07d7603a2ed5..f28e0fd8ba29b59feec5e4386745ad80651405ef
@@@ -1,1 -1,1 +1,1 @@@
- 87995dc9409482f0a7a367bfc51d78ac0f63b8c3
 -c0d89d4a9752922f9e367362366efde4f1b06f2a
++86633e01fec2cbc00c749f6ef6ecda6acad2a82e