Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9424 - connorimes:energy-monitor-0.1.1, r=jdm

Browse source 
Update energy-monitor to 0.1.1 for change to dual license

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9424)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-26 04:19:58 +05:30
commit d34641dc3f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/servo/Cargo.lock generated
View file

@ -468,7 +468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "energy-monitor"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -476,7 +476,7 @@ name = "energymon"
version = "0.1.0"
source = "git+https://github.com/energymon/energymon-rust.git#637e537934cdfc2142011a910490a408ea135af2"
dependencies = [
"energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"energy-monitor 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon-default-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1420,7 +1420,7 @@ dependencies = [
name = "profile_traits"
version = "0.0.1"
dependencies = [
"energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"energy-monitor 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon 0.1.0 (git+https://github.com/energymon/energymon-rust.git)",
"ipc-channel 0.1.0 (git+https://github.com/servo/ipc-channel)",
"plugins 0.0.1",