Nick Parker 82db0d7e90 Merge sqlite-release(3.8.4.3) into prerelease-integration
Conflicts:
	Makefile.in
	README
	VERSION
	configure
	manifest
	manifest.uuid
	sqlcipher.1
	src/pragma.c
	src/shell.c
2014-04-04 13:16:23 -05:00
..
2014-04-04 10:16:20 -05:00
2012-11-15 18:45:58 -05:00
2008-07-30 09:15:43 -04:00
2011-12-26 14:52:17 -05:00
2008-07-30 09:15:43 -04:00
2009-04-21 10:39:00 -04:00
2009-12-03 16:24:07 -05:00
2011-08-17 13:17:32 -04:00
2014-04-04 10:16:20 -05:00
2009-12-03 16:24:07 -05:00
2014-04-04 10:16:20 -05:00
2009-12-03 16:24:07 -05:00
2009-02-20 15:33:35 -05:00
2012-11-15 18:45:58 -05:00
2012-11-15 18:45:58 -05:00
2014-04-04 10:16:20 -05:00
2011-12-26 14:52:17 -05:00
2008-07-30 09:15:43 -04:00
2014-04-04 10:16:20 -05:00
2010-05-18 12:22:17 -04:00
2011-05-05 22:37:34 -04:00
2014-04-04 10:16:20 -05:00
2011-02-16 16:14:46 -05:00
2013-05-21 15:38:11 -05:00
2008-07-30 09:15:43 -04:00
2008-07-30 09:15:43 -04:00
2008-07-30 09:15:43 -04:00
2009-02-20 15:33:35 -05:00
2008-07-30 09:15:43 -04:00
2008-07-30 09:15:43 -04:00
2008-07-30 09:15:43 -04:00
2011-05-05 22:37:34 -04:00
2011-12-26 14:52:17 -05:00
2011-12-26 14:52:17 -05:00
2011-12-26 14:52:17 -05:00
2012-07-18 14:42:52 -04:00