Commit 90d317e0 authored Dec 15, 2015 by Steven Fackler

Merge branch 'release'

parents 6d559bf1 cf075d8e

README.md

+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.1/openssl).
		[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl).

		## Building

openssl-sys-extras/Cargo.toml

+2 −4

Original line number	Diff line number	Diff line
		[package]
		name = "openssl-sys-extras"
		version = "0.7.1"
		version = "0.7.2"
		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.1/openssl_sys_extras"

		links = "openssl_shim"
		documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl_sys_extras"
		build = "build.rs"

		[features]

openssl-sys-extras/src/lib.rs

+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.0")]
		#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.2")]

		extern crate openssl_sys;
		extern crate libc;

openssl-sys/Cargo.toml

+2 −3

Original line number	Diff line number	Diff line
		[package]
		name = "openssl-sys"
		version = "0.7.1"
		version = "0.7.2"
		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.1/openssl_sys"

		documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl_sys"
		links = "openssl"
		build = "build.rs"

openssl-sys/src/lib.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.1")]
		#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.2")]

		extern crate libc;