Merge branch 'prerelease' into ditto

Conflicts:
	src/func.c
This commit is contained in:
Billy Gray
2013-06-14 12:35:37 -04:00
318 changed files with 22539 additions and 4749 deletions
-2
View File
@@ -197,14 +197,12 @@
INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
"-DNDEBUG",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
);
"OTHER_CFLAGS[arch=armv6]" = (
"-mno-thumb",
"-DSQLITE_HAS_CODEC",
"-DNDEBUG",
"-DSQLITE_TEMP_STORE=2",
"-DSQLITE_THREADSAFE",
);