dgit.raspbian.org Git - cargo.git/commit

projects / cargo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c0be7f4 92a3a4e)

author	Chris Swindle <christopher.swindle@metaswitch.com>
	Tue, 24 Oct 2017 19:54:59 +0000 (20:54 +0100)
committer	Chris Swindle <christopher.swindle@metaswitch.com>
	Tue, 24 Oct 2017 19:54:59 +0000 (20:54 +0100)
commit	d43bf9c5f4026f434f4f7dca56991b477f42a063
tree	ce508f51516f1c6317e3914bdea09af39309f1f4	tree \| snapshot
parent	c0be7f4b6d8e232fa51a6d0135b02eca1e13b788	commit \| diff
parent	92a3a4efa27900e97a8ccb3c5c9b45f06f439454	commit \| diff

Merge branch 'master' of github.com:rust-lang/cargo into alt-registries

src/bin/login.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/ops/registry.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/util/config.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/util/toml/mod.rs	diff1 \|	diff2 \|	blob \| history
tests/bad-config.rs	diff1 \|	diff2 \|	blob \| history
tests/cargotest/support/registry.rs	diff1 \|	diff2 \|	blob \| history
tests/directory.rs	diff1 \|	diff2 \|	blob \| history
tests/install.rs	diff1 \|	diff2 \|	blob \| history
tests/local-registry.rs	diff1 \|	diff2 \|	blob \| history
tests/registry.rs	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.