Merge tag 'upstream/2.2.1'

Upstream version 2.2.1
# gpg: Signature made Tue 13 Aug 2013 03:42:56 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"
# gpg:                 aka "Hans-Christoph Steiner <hs420@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hansi@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"

1 files changed, 33 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 59bb33f..0af1a93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,39 @@
+*.lo
+*.o
 *.mode1v3
 *.pbxuser
 xcuserdata
 xcuserdata/*
 *.xcworkspace/*
 *.xcworkspace
-.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
+/Makefile
+/.libs
+/.target_source
+/config.h
+/config.log
+/config.status
+/keywordhash.h
+/mkkeywordhash
+/opcodes.c
+/opcodes.h
+/parse.c
+/parse.h
+/parse.h.temp
+/parse.out
+/tsrc
+/testfixture
+/lemon
+/libtool
+/libsqlite3.la
+/libtclsqlite3.la
+/sqlite3
+/sqlite3.c
+/sqlite3.h
+/lempar.c
+/parse.y
+/shell.c
+/sqlcipher
+/sqlite3.pc
+/sqlcipher.pc
+/sqlite3ext.h
+/libsqlcipher.la