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, 15 insertions, 0 deletions

diff --git a/core/src/window.rs b/core/src/window.rs
new file mode 100644
index 00000000..a6dbdfb4
--- /dev/null
+++ b/core/src/window.rs
@@ -0,0 +1,15 @@
+//! Build window-based GUI applications.
+pub mod icon;
+
+mod event;
+mod level;
+mod mode;
+mod redraw_request;
+mod user_attention;
+
+pub use event::Event;
+pub use icon::Icon;
+pub use level::Level;
+pub use mode::Mode;
+pub use redraw_request::RedrawRequest;
+pub use user_attention::UserAttention;