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, 23 deletions

diff --git a/native/src/touch.rs b/native/src/touch.rs
deleted file mode 100644
index 18120644..00000000
--- a/native/src/touch.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Build touch events.
-use crate::Point;
-
-/// A touch interaction.
-#[derive(Debug, Clone, Copy, PartialEq)]
-#[allow(missing_docs)]
-pub enum Event {
-    /// A touch interaction was started.
-    FingerPressed { id: Finger, position: Point },
-
-    /// An on-going touch interaction was moved.
-    FingerMoved { id: Finger, position: Point },
-
-    /// A touch interaction was ended.
-    FingerLifted { id: Finger, position: Point },
-
-    /// A touch interaction was canceled.
-    FingerLost { id: Finger, position: Point },
-}
-
-/// A unique identifier representing a finger on a touch interaction.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct Finger(pub u64);