From 1c6d87f578edee720b4e9263403b39c7182917ed Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 25 Jul 2015 22:03:31 -0700
Subject: [PATCH] All: Update CHANGES

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 99b9dfdd6..540ad89d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -108,6 +108,7 @@ Misc:
  - GBA: Savedata is now synced shortly after data finishes being written
  - GBA Input: Allow axes and buttons to be mapped to the same key
  - GBA BIOS: Stub out SoundBias
+ - Qt: Gamepads can now have both buttons and analog axes mapped to the same key
 
 0.2.1: (2015-05-13)
 Bugfixes: