From 7dc294e3e636eed81fb5db5d4bf8ef4618b8226c Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Fri, 21 Jan 2011 18:39:05 -0800
Subject: [PATCH] Changelog updated.

---
 CHANGELOG.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 28c87306c..725d42212 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,16 @@
+2.12:
+- Added new flat file permissions resolver, added * support for
+    ConfigurationPermissionsResolver.
+- Added support for Niji's permission system.
+- Fixed bad list to array conversion in ConfigurationPermissionsResolver.
+- Fixed default permissions with the built-in permission resolvers.
+- Fixed issue with BlockWorldVector causing java.lang.VerifyError due to
+    how Bukkit loads plugins.
+- Ops now have all permissions.
+- Changed /reload WorldEdit to /reloadwe.
+- Moved WorldEdit to use Bukkit's command registration. Let's hope
+    this didn't break things.
+
 2.11:
 - Ported over toi's ray tracing code so that it's now included in
     WorldEdit. This will make porting WorldEdit to single player