From 96172693fe0a25c6bc0f0497c9d04429bd17d2cb Mon Sep 17 00:00:00 2001
From: Kirill Chibisov <contact@kchibisov.com>
Date: Fri, 1 Mar 2024 14:11:28 +0400
Subject: [PATCH] Bump version on master

This commit does not represent a release and only synchronizes CHANGELOG
from the latest release.
---
 CHANGELOG.md            | 7 +++++--
 Cargo.toml              | 2 +-
 README.md               | 2 +-
 src/platform/android.rs | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa3df0a59c..25d51fdcea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,6 @@ Unreleased` header.
 
 # Unreleased
 
-- On X11, fix use after free during xinput2 handling.
-- On X11, filter close to zero values in mouse device events
 - Move `dpi` types to its own crate, and re-export it from the root crate.
 - Implement `Sync` for `EventLoopProxy<T: Send>`.
 - **Breaking:** Move `Window::new` to `ActiveEventLoop::create_window` and `EventLoop::create_window` (with the latter being deprecated).
@@ -49,6 +47,11 @@ Unreleased` header.
 - **Breaking:** Removed `EventLoopBuilder::with_user_event`, the functionality is now available in `EventLoop::with_user_event`.
 - Add `Window::default_attributes` to get default `WindowAttributes`.
 
+# 0.29.12
+
+- On X11, fix use after free during xinput2 handling.
+- On X11, filter close to zero values in mouse device events
+
 # 0.29.11
 
 - Fix compatibility with 32-bit platforms without 64-bit atomics.
diff --git a/Cargo.toml b/Cargo.toml
index f4b93a4247..f31d83fb5c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "winit"
-version = "0.29.11"
+version = "0.29.12"
 authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
 keywords = ["windowing"]
diff --git a/README.md b/README.md
index ccc3a2ab29..3d484ccb28 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ```toml
 [dependencies]
-winit = "0.29.11"
+winit = "0.29.12"
 ```
 
 ## [Documentation](https://docs.rs/winit)
diff --git a/src/platform/android.rs b/src/platform/android.rs
index 3b45057e4e..d8460f8525 100644
--- a/src/platform/android.rs
+++ b/src/platform/android.rs
@@ -60,7 +60,7 @@
 //!
 //! If your application is currently based on `NativeActivity` via the `ndk-glue` crate and building with `cargo apk`, then the minimal changes would be:
 //! 1. Remove `ndk-glue` from your `Cargo.toml`
-//! 2. Enable the `"android-native-activity"` feature for Winit: `winit = { version = "0.29.11", features = [ "android-native-activity" ] }`
+//! 2. Enable the `"android-native-activity"` feature for Winit: `winit = { version = "0.29.12", features = [ "android-native-activity" ] }`
 //! 3. Add an `android_main` entrypoint (as above), instead of using the '`[ndk_glue::main]` proc macro from `ndk-macros` (optionally add a dependency on `android_logger` and initialize logging as above).
 //! 4. Pass a clone of the `AndroidApp` that your application receives to Winit when building your event loop (as shown above).