Merge tag 'upstream/2.1.1'

Upstream version 2.1.1

Conflicts:
	.gitignore

1 files changed, 28 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index f8d689e..61af32f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,32 @@ xcuserdata
 xcuserdata/*
 *.xcworkspace/*
 *.xcworkspace
-www/
-sqlcipher/sqlcipher-1.1.8-testkey.db
-tool/crypto-speedtest.tcl
+.libs
+.target_source
+Makefile
+config.h
+config.log
+config.status
+keywordhash.h
+lemon
+lempar.c
+libsqlite3.la
+libtclsqlite3.la
+libtool
+mkkeywordhash
+opcodes.c
+opcodes.h
+parse.c
+parse.h
+parse.h.temp
+parse.out
+parse.y
+sqlite3
+sqlite3.c
+sqlite3.h
+*.lo
+*.o
+tsrc
+sqlite3.pc
+testfixture
 configure