Merge remote-tracking branch 'origin/prerelease' into kdfiter

2013-07-11 16:21:00 -05:00 · 2013-07-11 16:21:00 -05:00 · 81e487afb7
parent 1d3fc78431 3ef19cf3d5
commit 81e487afb7
2 changed files with 2 additions and 2 deletions
--- a/src/crypto.h
+++ b/src/crypto.h
@ -44,7 +44,7 @@
 #define FILE_HEADER_SZ 16

 #ifndef CIPHER_VERSION
-#define CIPHER_VERSION "2.2.0"
+#define CIPHER_VERSION "2.2.1"
 #endif

 #ifndef CIPHER
--- a/test/crypto.test
+++ b/test/crypto.test
@ -1424,7 +1424,7 @@ do_test verify-pragma-cipher-version {
    execsql {
        PRAGMA cipher_version;
    }
-} {2.2.0}
+} {2.2.1}
 db close
 file delete -force test.db