metacity r3994 - in trunk: . tools

[tthurman svn gnome org]

Author: tthurman
Date: Thu Oct 23 04:32:03 2008
New Revision: 3994
URL: http://svn.gnome.org/viewvc/metacity?rev=3994&view=rev

Log:
2.25.5 release.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/tools/release-wrangler.py

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Oct 23 04:32:03 2008
@@ -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
 ======
 

Modified: trunk/tools/release-wrangler.py
==============================================================================
--- trunk/tools/release-wrangler.py	(original)
+++ trunk/tools/release-wrangler.py	Thu Oct 23 04:32:03 2008
@@ -62,7 +62,7 @@
   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())