Merge branch 'master' of https://github.com/photex/rusqlite into photex-master

This commit is contained in:
John Gallagher
2016-12-31 00:55:01 -05:00
10 changed files with 208413 additions and 465 deletions

View File

@@ -78,6 +78,7 @@ features](http://doc.crates.io/manifest.html#the-features-section). They are:
* `serde_json` implements [`FromSql`](http://jgallagher.github.io/rusqlite/rusqlite/types/trait.FromSql.html)
and [`ToSql`](http://jgallagher.github.io/rusqlite/rusqlite/types/trait.ToSql.html) for the
`Value` type from the [`serde_json` crate](https://crates.io/crates/serde_json).
* `bundled` uses a bundled version of sqlite3. This is a good option for cases where linking to sqlite3 is complicated, like for example Windows.
## Author