From 23c04a116875c97d4ca26f5e9acadd6d719c81e4 Mon Sep 17 00:00:00 2001
From: Chris <chris.h@cardforge.org>
Date: Thu, 24 May 2012 11:22:47 +0000
Subject: [PATCH] - Added the recent commit logs to changes.txt. Preparing for
 the snapshot build release.

---
 CHANGES.txt | 60 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b7633a07ac9..0b0a915e1e9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -246,6 +246,18 @@ Fixes/Features:
 - edited merge properties some more
 - Added the static ability "CostChange".
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
+- Fixed Deny Reality, it now is a Sorcery.
+- merged mana_restrictions branch into Trunk
+- Added basic AI to AF GenericChoice.
+- Removed some unused functions.
+- Little tweak in charmCanPlayAI.
+- Add print proxy functionality back into GUI
+- fixed static effect on Grand Architect
+- Home screen converted to drag cell layout (minor visual change; mainly structural).
+- Bugfix: panels not clearing properly
+- Fixed odd "unknown" skin icon in quest mode.
+- Updated print icon in sprite.
+- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
 
 
 Many people helped with this version. A special thank you goes out to them. (Attempted to list names alphabetically):
@@ -253,30 +265,6 @@ Many people helped with this version. A special thank you goes out to them. (Att
 
 
 
-AbilityWork branch:
-
-Altar of the Lost
-Ancient Ziggurat
-Cavern of Souls
-Dark Impostor
-Eldrazi Temple
-Food Chain
-Geosurge
-Grand Architect
-Metamorphosis
-Mishra's Workshop
-Myr Reservoir
-Myr Welder
-Pillar of the Paruns
-Primal Beyond
-Rosheen Meanderer
-Smokebraider
-Soldevi Machinist
-Somberwald Sage
-Untaidake, the Cloud Keeper
-Vedalken Engineer
-
-
 Added many cards, including:
 
 Words of Waste
@@ -316,6 +304,30 @@ Aquamorph Entity
 Angel of Salvation
 Antagonism
 Hunter Sliver
+Altar of the Lost
+Ancient Ziggurat
+Cavern of Souls
+Dark Impostor
+Eldrazi Temple
+Food Chain
+Geosurge
+Grand Architect
+Metamorphosis
+Mishra's Workshop
+Myr Reservoir
+Myr Welder
+Pillar of the Paruns
+Primal Beyond
+Rosheen Meanderer
+Smokebraider
+Soldevi Machinist
+Somberwald Sage
+Untaidake, the Cloud Keeper
+Vedalken Engineer
+Balshan Beguiler
+Bifurcate
+Blizzard Specter
+Blood Oath
 
 
 end