Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 0 insertions, 38 deletions

diff --git a/native/src/window.rs b/native/src/window.rs
index 660cd54f..e69de29b 100644
--- a/native/src/window.rs
+++ b/native/src/window.rs
@@ -1,38 +0,0 @@
-//! Build window-based GUI applications.
-mod action;
-mod event;
-mod icon;
-mod id;
-mod mode;
-mod position;
-mod redraw_request;
-mod settings;
-mod user_attention;
-
-pub use action::Action;
-pub use event::Event;
-pub use icon::Icon;
-pub use id::Id;
-pub use mode::Mode;
-pub use position::Position;
-pub use redraw_request::RedrawRequest;
-pub use settings::Settings;
-pub use user_attention::UserAttention;
-
-use crate::subscription::{self, Subscription};
-use crate::time::Instant;
-
-/// Subscribes to the frames of the window of the running application.
-///
-/// The resulting [`Subscription`] will produce items at a rate equal to the
-/// refresh rate of the window. Note that this rate may be variable, as it is
-/// normally managed by the graphics driver and/or the OS.
-///
-/// In any case, this [`Subscription`] is useful to smoothly draw application-driven
-/// animations without missing any frames.
-pub fn frames() -> Subscription<Instant> {
-    subscription::raw_events(|event, _status| match event {
-        crate::Event::Window(_, Event::RedrawRequested(at)) => Some(at),
-        _ => None,
-    })
-}