From 0341f279324f6814feb2a2224623cf61453b1bd7 Mon Sep 17 00:00:00 2001
From: Scott Brooks <blaze@rq3.com>
Date: Tue, 17 Sep 2002 20:18:34 +0000
Subject: [PATCH] Updated Changelog

---
 reaction/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/reaction/ChangeLog b/reaction/ChangeLog
index 3ca03591..9cc74983 100644
--- a/reaction/ChangeLog
+++ b/reaction/ChangeLog
@@ -1,3 +1,7 @@
+# List fixes here for post 2.25
+
+* Fixed the cg_rq3_autoaction code up a bit more to show the map name, and a few other fixes
+
 # List fixes here for the 2.25 release
 
 * Problem fixed in the bullet firing code that affected the otherwise good hitboxes.
@@ -154,3 +158,7 @@
 * Shell ejections on spawn in TP should be fixed
 * Added pirate and pikey radio sets. cg_RQ3_radiovoice 0, 1, 2 or 3
 * Added CTB radio commands to all radio sets.
+<<<<<<< ChangeLog
+* Added spawnflag 8 to breakables and func_buttons to allow them to be unkickable
+=======
+>>>>>>> 1.87