From b467ecfd5141eafe316427240d7de9b6f2d070e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
Date: Wed, 23 Jun 2010 15:24:54 +0200
Subject: [PATCH] Added info to changelog
---
debian/rules | 1 +
doc/ChangeLog.html | 15 ++++++++++++++-
src/stratagus/stratagus.cpp | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index ea57b7378..1b4fe13b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
# debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
# GNU Copyright 2002-2004 by David Mart�nez Moreno.
+# GNU Copyright 2010 by Pali Rohar
# Do you want verbosity...? Uncomment this.
#export DH_VERBOSE=1
diff --git a/doc/ChangeLog.html b/doc/ChangeLog.html
index 148fc1f97..513a7e75b 100644
--- a/doc/ChangeLog.html
+++ b/doc/ChangeLog.html
@@ -31,11 +31,24 @@
<ul>
+<p><li>2.2.6 UNRELEASED<p>
+ <ul>
+ <li>Ported stratagus to Maemo systems - Nokia N900 (from Pali Rohar)
+ <li>Ported engine to OpenGL ES 1.1 (from Pali Rohar)
+ <li>Fixed minimap (from upstream svn boswars)
+ <li>Fixed cross compile MinGW 32/64 (from Pali Rohar)
+ <li>Added option print debug output to console on Windows (from Pali Rohar)
+ <li>Added function PlayMovie to LUA scripts - play movies from game (from Pali Rohar)
+ <li>Added support for 64bit Windows version (from Pali Rohar)
+ <li>Added new NSIS Installer for Windows (from Pali Rohar)
+ </ul>
+
<p><li>2.2.5 Released<p>
<ul>
<li>Fixed attack range off by 1 bug (from Jimmy Salmon)
<li>Fixed bug releasing the same resource twice (from Jimmy Salmon)
</ul>
+
<p><li>2.2.4 Released<p>
<ul>
<li>Sea and air units don't bounce up and down anymore, that caused strange drawing errors with ships next to each other (from Jimmy Salmon)
@@ -1292,7 +1305,7 @@ g the callback. (from Francois Beerten)
</ul>
<hr>
-(C) Copyright 1998-2007 by The <a href="http://stratagus.org">Stratagus</a> Project
+(C) Copyright 1998-2010 by The <a href="http://stratagus.org">Stratagus</a> Project
under the <a href="gpl.html">GNU General Public License</a>.<br>
All trademarks and copyrights on this page are owned by their respective owners.<br>
</body>
diff --git a/src/stratagus/stratagus.cpp b/src/stratagus/stratagus.cpp
index 732e30866..62d42d9cd 100644
--- a/src/stratagus/stratagus.cpp
+++ b/src/stratagus/stratagus.cpp
@@ -538,7 +538,7 @@ int SaveReplay(const std::string &filename)
static void PrintHeader(void)
{
fprintf(stdout, "%s\n written by Lutz Sammer, Fabrice Rossi, Vladi Shabanski, Patrice Fortier,\n"
- "Jon Gabrielson, Andreas Arens, Nehal Mistry, Jimmy Salmon, and others.\n"
+ "Jon Gabrielson, Andreas Arens, Nehal Mistry, Jimmy Salmon, Pali Rohar, and others.\n"
"\t(http://stratagus.org)"
"\nCompile options %s", NameLine, CompileOptions.c_str());
}