summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorThomas Thurman <thomas@thurman.org.uk>2007-02-22 02:40:31 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2007-02-22 02:40:31 +0000
commit1fed2822e5b35377b09495423adf9073922f75be (patch)
treedd1e769c44399c8349a8b11594c2c88535313bea /ChangeLog
parent56b59faf873b92b732133fc031da2a6af3a161a8 (diff)
downloadmetacity-1fed2822e5b35377b09495423adf9073922f75be.tar.gz
back out last patch from Linus because it belongs in trunk and not the
2007-02-21 Thomas Thurman <thomas@thurman.org.uk> * src/common.h, src/frames.c, src/prefs.c: back out last patch from Linus because it belongs in trunk and not the 2.18 branch. (My fault for applying it in the wrong place.) svn path=/branches/gnome-2-18/; revision=3068
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eedc031a..c5391e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-21 Thomas Thurman <thomas@thurman.org.uk>
+
+ * src/common.h, src/frames.c, src/prefs.c: back out
+ last patch from Linus because it belongs in trunk and
+ not the 2.18 branch. (My fault for applying it in the
+ wrong place.)
+
2007-02-20 Kjartan Maraas <kmaraas@gnome.org>
* Makefile.am: Add MAINTAINERS to EXTRA_DIST so others