From 7f6c774bf52e6e9587c1a9d4124482b3daec0412 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Thu, 23 Jun 2016 02:52:47 +0000
Subject: [PATCH] Update changelog for 2.2.

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acbd62e..73c7d25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+2.2
+---
+
+Other new features:
+  * OS X: support 3Dconnexion devices (SpaceMouse, SpaceNavigator, etc).
+
+Bug fixes:
+  * Three.js: correctly respond to controls when browser zoom is used.
+  * OS X: do not completely hide main window when defocused.
+
 2.1
 ---