summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas James Alexander Thurman <tthurman@src.gnome.org>2008-10-23 04:32:03 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-10-23 04:32:03 +0000
commit647f75c4e8d9c94c40879789a742729dd9dff3d8 (patch)
tree603b21f6b5ecd58dd2690fbc3a6b33c2e128b91a
parent348795b94d6b0f41fc80676203f34ae66692d19b (diff)
downloadmetacity-647f75c4e8d9c94c40879789a742729dd9dff3d8.tar.gz
metacity-647f75c4e8d9c94c40879789a742729dd9dff3d8.tar.bz2
2.25.5 release.
svn path=/trunk/; revision=3994
-rw-r--r--ChangeLog6
-rw-r--r--NEWS12
-rw-r--r--tools/release-wrangler.py2
3 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 51cebc2..7d63296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
2008-10-23 Thomas Thurman <tthurman@gnome.org>
- * configure.in: Post-release bump to 2.25.5.
+ * NEWS: 2.25.5 release.
2008-10-23 Thomas Thurman <tthurman@gnome.org>
@@ -29,6 +29,10 @@
2008-10-22 Thomas Thurman <tthurman@gnome.org>
+ * configure.in: Post-release bump to 2.25.5.
+
+2008-10-22 Thomas Thurman <tthurman@gnome.org>
+
* NEWS: 2.25.3 release.
2008-10-22 Thomas Thurman <tthurman@gnome.org>
diff --git a/NEWS b/NEWS
index 2a49be3..d8c2d34 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+2.25.5
+======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+ - Allow third-party apps to decide whether a window appears
+ on all workspaces (Thomas) (#557536)
+ - Fixed keybindings script (again) (Thomas)
+
+Translations
+ David Planella (ca), Robert Millan (ca@valencia)
+
2.25.3
======
diff --git a/tools/release-wrangler.py b/tools/release-wrangler.py
index 2945fcf..548af7f 100644
--- a/tools/release-wrangler.py
+++ b/tools/release-wrangler.py
@@ -62,7 +62,7 @@ def check_we_are_up_to_date():
changed = []
for line in commands.getoutput('/usr/bin/svn status').split('\n'):
if line!='' and (line[0]=='C' or line[0]=='M'):
- if line.find('release-wrangler.py')==-1:
+ if line.find('release-wrangler.py')==-1 and line.find('ChangeLog')==-1:
# we should be insensitive to changes in this script itself
# to avoid chicken-and-egg problems
changed.append(line[1:].lstrip())