Merge branch 'web' into merge-master-to-web
This commit is contained in:
commit
86bafdc104
10 changed files with 61 additions and 19 deletions
|
|
@ -21,9 +21,7 @@ pub use self::error::OsError;
|
|||
pub use self::event_loop::{
|
||||
EventLoop, Proxy as EventLoopProxy, WindowTarget as EventLoopWindowTarget,
|
||||
};
|
||||
pub use self::monitor::{
|
||||
Handle as MonitorHandle, Mode as VideoMode
|
||||
};
|
||||
pub use self::monitor::{Handle as MonitorHandle, Mode as VideoMode};
|
||||
pub use self::window::{
|
||||
Id as WindowId, PlatformSpecificBuilderAttributes as PlatformSpecificWindowBuilderAttributes,
|
||||
Window,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue