Merge tag 'upstream/3.2.0'

Upstream version 3.2.0

# gpg: Signature made Thu 16 Oct 2014 10:51:39 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"

1 files changed, 4 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 0af1a93..f68644e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ xcuserdata/*
 /config.log
 /config.status
 /keywordhash.h
-/mkkeywordhash
+/mkkeywordhash*
 /opcodes.c
 /opcodes.h
 /parse.c
@@ -21,8 +21,8 @@ xcuserdata/*
 /parse.h.temp
 /parse.out
 /tsrc
-/testfixture
-/lemon
+/testfixture*
+/lemon*
 /libtool
 /libsqlite3.la
 /libtclsqlite3.la
@@ -37,3 +37,4 @@ xcuserdata/*
 /sqlcipher.pc
 /sqlite3ext.h
 /libsqlcipher.la
+/.DS_Store