git.ipfire.org Git - thirdparty/sqlite.git/commit

]> git.ipfire.org Git - thirdparty/sqlite.git/commit

author	mistachkin <mistachkin@noemail.net>
	Thu, 8 Mar 2012 20:22:42 +0000 (20:22 +0000)
committer	mistachkin <mistachkin@noemail.net>
	Thu, 8 Mar 2012 20:22:42 +0000 (20:22 +0000)
commit	6aa18c95f1dba0e91a3e2554e851db14cfe1ae8b
tree	a2e957ea658a7c68cb8f869b156fb2992717b0c4	tree
parent	5483f772b1d34c7228c102ce486f78710b237dd4	commit \| diff
parent	f8a784645cd27c4cbbf87fc5e3001ee74867b298	commit \| diff

Merge and manually resolve testing updates from trunk.

FossilOrigin-Name: 5eecdb44dd809e91002b8ecf59ada72f4b56549a

Mirror of https://github.com/sqlite/sqlite.git