From 3a34f634153b47f824aa4790c7fd8cd522e5f148 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 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acbd62e2..a7a052e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,23 @@
 Changelog
 =========
 
+3.0
+---
+
+New export/import features:
+  * Three.js: allow configuring projection for exported model, and initially
+    use the current viewport projection.
+
+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
 ---