Merge branch 'functions' of https://github.com/gwenn/rusqlite into gwenn-functions

Conflicts:
	Cargo.toml
	src/lib.rs
This commit is contained in:
John Gallagher
2015-12-11 11:31:25 -05:00
5 changed files with 357 additions and 0 deletions

View File

@@ -15,6 +15,7 @@ name = "rusqlite"
[features]
load_extension = ["libsqlite3-sys/load_extension"]
backup = []
functions = []
trace = []
[dependencies]
@@ -25,6 +26,7 @@ libc = "~0.2"
[dev-dependencies]
tempdir = "~0.3.4"
lazy_static = "~0.1"
regex = "~0.1.41"
[dependencies.libsqlite3-sys]
path = "libsqlite3-sys"