diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-22 04:51:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-22 04:51:46 -0500 |
| commit | a0a62ed3fdc023015fd59cf9358e0a0cc3b2bc9b (patch) | |
| tree | a135e5cd3b4292909d0fe0267ad19873dfc99f1e | |
| parent | 47387a5c442c5a0167b5286fa1113124ba8d67db (diff) | |
| parent | bab5c27487adc27e30b500df4467736b34a6d79c (diff) | |
| download | servo-a0a62ed3fdc023015fd59cf9358e0a0cc3b2bc9b.tar.gz servo-a0a62ed3fdc023015fd59cf9358e0a0cc3b2bc9b.zip | |
Auto merge of #11819 - servo:glutin-feature, r=nox
Remove the glutin_app feature from the servo crate.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11819)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.toml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index ba363a8f2aa..8e806baac75 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -19,7 +19,7 @@ doc = false bench = false [features] -default = ["glutin_app", "webdriver", "max_log_level"] +default = ["webdriver", "max_log_level"] max_log_level = ["log/release_max_level_info"] webdriver = ["webdriver_server"] energy-profiling = ["profile_traits/energy-profiling"] @@ -65,7 +65,7 @@ canvas_traits = {path = "../canvas_traits"} devtools = {path = "../devtools"} webdriver_server = {path = "../webdriver_server", optional = true} devtools_traits = {path = "../devtools_traits"} -glutin_app = {path = "../../ports/glutin", optional = true} +glutin_app = {path = "../../ports/glutin"} ipc-channel = {git = "https://github.com/servo/ipc-channel"} gleam = "0.2" browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"} |