summaryrefslogtreecommitdiff
path: root/Changelog-Renewal.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Changelog-Renewal.txt')
-rw-r--r--Changelog-Renewal.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt
index 5b17814e7..ed353115c 100644
--- a/Changelog-Renewal.txt
+++ b/Changelog-Renewal.txt
@@ -1,5 +1,7 @@
Date Added
+2010/12/26
+ * Merged changes from trunk (r14496:14630). [Ai4rei]
2010/11/23
* Added script command pushpc, which is required by newer scripts. [Ai4rei]
- Moved knockback-part of skill_blown into unit_blown, to allow unconditional knockback required by pushpc without copy-pasting code.