Commit 4af4183e authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release'

parents 643a4a58 7540471c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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.5/openssl).
[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.6/openssl).

## Building

+3 −3
Original line number Diff line number Diff line
[package]
name = "openssl-sys-extras"
version = "0.7.5"
version = "0.7.6"
authors = ["Steven Fackler <sfackler@gmail.com>"]
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.5/openssl_sys_extras"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.6/openssl_sys_extras"
build = "build.rs"

[features]
@@ -13,7 +13,7 @@ ecdh_auto = []

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

[build-dependencies]
gcc = "0.3"
+1 −1
Original line number Diff line number Diff line
#![allow(non_upper_case_globals, non_snake_case)]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.5")]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.6")]

extern crate openssl_sys;
extern crate libc;
+2 −2
Original line number Diff line number Diff line
[package]
name = "openssl-sys"
version = "0.7.5"
version = "0.7.6"
authors = ["Alex Crichton <alex@alexcrichton.com>",
           "Steven Fackler <sfackler@gmail.com>"]
license = "MIT"
description = "FFI bindings to OpenSSL"
repository = "https://github.com/sfackler/rust-openssl"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.5/openssl_sys"
documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.6/openssl_sys"
links = "openssl"
build = "build.rs"

+1 −1
Original line number Diff line number Diff line
#![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.5")]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.6")]

extern crate libc;

Loading