migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 15:13:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the examples

Browse Source
This commit is contained in:
Ryan Goldstein
2019-09-24 19:44:43 -04:00
parent 86bafdc104
commit dcd9ddde50
3 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/multithreaded.rs
View File

@@ -2,15 +2,7 @@
fn main() {
extern crate env_logger;
<<<<<<< HEAD
use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
=======
use winit::{
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
event_loop::{ControlFlow, EventLoop},
window::{CursorIcon, Fullscreen, WindowBuilder},
};
>>>>>>> master
use winit::{
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},