summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-09-08 20:38:35 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-09-08 20:38:35 +0000
commitb1f0333d7e8bc35c356f562a893689ab5af3a84f (patch)
tree3646e00773626b26becdb257c8cb9c3a29f9846f
parent867f4529cd151105e24465bc4841e72d6e97eace (diff)
downloadmetacity-b1f0333d7e8bc35c356f562a893689ab5af3a84f.tar.gz
add metacity-wm.desktop add the same to CLEANFILES
2008-09-08 Thomas Thurman <tthurman@gnome.org> * src/.cvsignore: add metacity-wm.desktop * src/Makefile.am: add the same to CLEANFILES svn path=/branches/gnome-2-24/; revision=3869
-rw-r--r--ChangeLog3
-rw-r--r--NEWS11
-rw-r--r--src/.cvsignore1
-rw-r--r--src/Makefile.am2
4 files changed, 4 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 74cfec71..932e6779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2008-09-08 Thomas Thurman <tthurman@gnome.org>
- * NEWS: 2.23.610 release.
+ * src/.cvsignore: add metacity-wm.desktop
+ * src/Makefile.am: add the same to CLEANFILES
2008-09-08 Vincent Untz <vuntz@gnome.org>
diff --git a/NEWS b/NEWS
index 22d46556..0c0428b5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,3 @@
-2.23.610
-========
-
-Thanks to Vincent Untz for improvements in this version.
-
- - Install both kinds of desktop file (Vincent) (#549479)
-
-Translations
- David Lodge (en_GB), Claude Paroz (fr), Seán de Búrca (ga), \n (ta), Funda
- Wang (zh_CN)
-
2.23.377
========
diff --git a/src/.cvsignore b/src/.cvsignore
index b998675a..f62415b3 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -9,6 +9,7 @@ testboxes
testgradient
inlinepixbufs.h
metacity.desktop
+metacity-wm.desktop
metacity.schemas
libmetacity-private.pc
testasyncgetprop
diff --git a/src/Makefile.am b/src/Makefile.am
index cc10f784..ea3e0f6e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,7 +192,7 @@ VARIABLES=default_icon_data $(srcdir)/default_icon.png \
stock_delete_data $(srcdir)/stock_delete.png
BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h