diff options
| author | Deokjin Kim <deokjin81.kim@samsung.com> | 2015-01-20 11:02:41 +0900 |
|---|---|---|
| committer | Deokjin Kim <deokjin81.kim@samsung.com> | 2015-01-20 11:02:41 +0900 |
| commit | ee0ce0d8f4eecede189ee85cf51a64519ffa5c80 (patch) | |
| tree | d563b117f264b305d5288caa00f4010f127e7c58 /components/servo | |
| parent | 80a6f0ae0880914f972b24a11216eed25d873576 (diff) | |
| parent | ccf5f96fa91540ca73cfb24dd130d5124975fc6e (diff) | |
| download | servo-ee0ce0d8f4eecede189ee85cf51a64519ffa5c80.tar.gz servo-ee0ce0d8f4eecede189ee85cf51a64519ffa5c80.zip | |
Merge branch 'master' of https://github.com/servo/servo into font_style
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.toml | 4 | ||||
| -rw-r--r-- | components/servo/main.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 52bdb2b6f31..f42178bb90f 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -27,8 +27,8 @@ path = "../../tests/contenttest.rs" harness = false [features] -default = ["glfw_app"] -glutin = ["glutin_app"] +default = ["glutin_app"] +glfw = ["glfw_app"] [dependencies.compositing] path = "../compositing" diff --git a/components/servo/main.rs b/components/servo/main.rs index 235b455ab32..81723d64b04 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -14,9 +14,9 @@ extern crate servo; extern crate time; extern crate "util" as servo_util; -#[cfg(all(feature = "glutin",not(test)))] +#[cfg(all(feature = "glutin_app",not(test)))] extern crate "glutin_app" as app; -#[cfg(all(feature = "glfw_app",not(test)))] +#[cfg(all(feature = "glfw",not(test)))] extern crate "glfw_app" as app; #[cfg(not(test))] |