Merge branch 'master' into merge-master-to-web

examples/window_run_return.rs

@@ -1,4 +1,17 @@
+<<<<<<< HEAD
 #[cfg(not(target_arch = "wasm32"))]
+=======
+// Limit this example to only compatible platforms.
+#[cfg(any(
+    target_os = "windows",
+    target_os = "macos",
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+>>>>>>> master
 fn main() {
     use winit::{
         event::{Event, WindowEvent},
@@ -6,6 +19,10 @@ fn main() {
         platform::desktop::EventLoopExtDesktop,
         window::WindowBuilder,
     };
+<<<<<<< HEAD
+=======
+
+>>>>>>> master
     let mut event_loop = EventLoop::new();
 
     let window = WindowBuilder::new()
@@ -40,7 +57,13 @@ fn main() {
     println!("Okay we're done now for real.");
 }
 
+<<<<<<< HEAD
 #[cfg(target_arch = "wasm32")]
 fn main() {
     panic!("Example not supported on Wasm");
+=======
+#[cfg(any(target_os = "ios", target_os = "android"))]
+fn main() {
+    println!("This platform doesn't support run_return.");
+>>>>>>> master
 }