Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
sfackler committed May 17, 2016
2 parents 1b07574 + 163a341 commit f26c8b7
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Build Status](https://travis-ci.org/sfackler/rust-openssl.svg?branch=master)](https://travis-ci.org/sfackler/rust-openssl)

[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.11/openssl).
[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.12/openssl).

## Building

Expand Down
6 changes: 3 additions & 3 deletions openssl-sys-extras/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[package]
name = "openssl-sys-extras"
version = "0.7.11"
version = "0.7.12"
authors = ["Steven Fackler <[email protected]>"]
license = "MIT"
description = "Extra FFI bindings to OpenSSL that require a C shim"
repository = "https://github.com/sfackler/rust-openssl"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.11/openssl_sys_extras"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.12/openssl_sys_extras"
build = "build.rs"

[features]
ecdh_auto = []

[dependencies]
libc = "0.2"
openssl-sys = { version = "0.7.11", path = "../openssl-sys" }
openssl-sys = { version = "0.7.12", path = "../openssl-sys" }

[build-dependencies]
gcc = "0.3"
2 changes: 1 addition & 1 deletion openssl-sys-extras/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(non_upper_case_globals, non_snake_case)]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.11")]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.12")]

extern crate openssl_sys;
extern crate libc;
Expand Down
4 changes: 2 additions & 2 deletions openssl-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "openssl-sys"
version = "0.7.11"
version = "0.7.12"
authors = ["Alex Crichton <[email protected]>",
"Steven Fackler <[email protected]>"]
license = "MIT"
description = "FFI bindings to OpenSSL"
repository = "https://github.com/sfackler/rust-openssl"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.11/openssl_sys"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.12/openssl_sys"
links = "openssl"
build = "build.rs"

Expand Down
2 changes: 1 addition & 1 deletion openssl-sys/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
#![allow(dead_code)]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.11")]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.12")]

extern crate libc;

Expand Down
8 changes: 4 additions & 4 deletions openssl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "openssl"
version = "0.7.11"
version = "0.7.12"
authors = ["Steven Fackler <[email protected]>"]
license = "Apache-2.0"
description = "OpenSSL bindings"
repository = "https://github.com/sfackler/rust-openssl"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.11/openssl"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.12/openssl"
readme = "../README.md"
keywords = ["crypto", "tls", "ssl", "dtls"]
build = "build.rs"
Expand All @@ -32,8 +32,8 @@ nightly = []
bitflags = ">= 0.5.0, < 0.8.0"
lazy_static = "0.2"
libc = "0.2"
openssl-sys = { version = "0.7.11", path = "../openssl-sys" }
openssl-sys-extras = { version = "0.7.11", path = "../openssl-sys-extras" }
openssl-sys = { version = "0.7.12", path = "../openssl-sys" }
openssl-sys-extras = { version = "0.7.12", path = "../openssl-sys-extras" }

[build-dependencies]
gcc = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.11")]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.12")]
#![cfg_attr(feature = "nightly", feature(const_fn))]

#[macro_use]
Expand Down

0 comments on commit f26c8b7

Please sign in to comment.