?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: ec013d7 640cd85)
Merge branch 'master' into v2betav2.0.0
commit0d1e81061db870aab99d9208498525e25510f1a6
authorStephen Lombardo <sjlombardo@zetetic.net>
Tue, 3 Jan 2012 16:17:36 +0000 (3 11:17 -0500)
committerStephen Lombardo <sjlombardo@zetetic.net>
Tue, 3 Jan 2012 16:17:36 +0000 (3 11:17 -0500)
tree8e33860fbde66d48ec2781ad530a9c55f7e8cb2btree | snapshot (tar.gz zip)
parentec013d7b51dbc2760a348dee6e25c03851ee0670commit | diff
parent640cd85a5db2a2b8e4a4cce48efc32846e008fc6commit | diff
Merge branch 'master' into v2beta

Conflicts:
src/crypto.c
SQLCipher is an SQLite extension that provides 256 bit AES encryption of database files.