From 2033356f9c102184218dbd296948115b83c95bde Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Mon, 18 Jan 2016 21:02:57 +0200 Subject: [PATCH] Fix mistakes in README file(s) --- README.markdown | 20 ++++++++++++++++---- README.md | 16 ---------------- 2 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 README.md diff --git a/README.markdown b/README.markdown index 1256e6f..65664a7 100644 --- a/README.markdown +++ b/README.markdown @@ -48,12 +48,24 @@ ui.window(im_str!("Hello world")) git submodule update --init --recursive cargo test - target/debug/examples/hello_world - target/debug/examples/test_window - target/debug/examples/test_window_impl + cargo run --example hello_world + cargo run --example test_window + cargo run --example test_window_impl ## License -imgui-rs is licensed under the MIT license. +Licensed under either of + + * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. Uses [ImGui](https://github.com/ocornut/imgui) and [cimgui](https://github.com/Extrawurst/cimgui). + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual licensed as above, without any additional terms or +conditions. diff --git a/README.md b/README.md deleted file mode 100644 index 14d6c70..0000000 --- a/README.md +++ /dev/null @@ -1,16 +0,0 @@ - -## License - -Licensed under either of - - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) - -at your option. - -### Contribution - -Unless you explicitly state otherwise, any contribution intentionally -submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or -conditions.