diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-09-01 14:38:48 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-09-01 14:38:48 -0600 |
| commit | 8b5418f58f5b80e3485ec9eff24d14dc0fbea9f9 (patch) | |
| tree | af55a4f9946b6f2e9596f2a01a66e94bdd8dcb81 /components | |
| parent | 493da96cae7cc0e3b533fc1f01cc0c5e38a27e02 (diff) | |
| parent | da1c8581d9d0fd133063ea5e39ce06d8abcc9218 (diff) | |
| download | servo-8b5418f58f5b80e3485ec9eff24d14dc0fbea9f9.tar.gz servo-8b5418f58f5b80e3485ec9eff24d14dc0fbea9f9.zip | |
Auto merge of #7438 - Wafflespeanut:cargo-tidy, r=jdm
Tidy can now check for version conflicts...
fixes #7133
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7438)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/servo/Cargo.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 5acf07fafc6..af8c32f26b0 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -627,7 +627,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] |