metacity r3869 - in branches/gnome-2-24: . src

[tthurman svn gnome org]

Author: tthurman
Date: Mon Sep  8 20:38:35 2008
New Revision: 3869
URL: http://svn.gnome.org/viewvc/metacity?rev=3869&view=rev

Log:
2008-09-08  Thomas Thurman  <tthurman gnome org>

        * src/.cvsignore: add metacity-wm.desktop
        * src/Makefile.am: add the same to CLEANFILES



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/NEWS
   branches/gnome-2-24/src/.cvsignore
   branches/gnome-2-24/src/Makefile.am

Modified: branches/gnome-2-24/NEWS
==============================================================================
--- branches/gnome-2-24/NEWS	(original)
+++ branches/gnome-2-24/NEWS	Mon Sep  8 20:38:35 2008
@@ -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
 ========
 

Modified: branches/gnome-2-24/src/.cvsignore
==============================================================================
--- branches/gnome-2-24/src/.cvsignore	(original)
+++ branches/gnome-2-24/src/.cvsignore	Mon Sep  8 20:38:35 2008
@@ -9,6 +9,7 @@
 testgradient
 inlinepixbufs.h
 metacity.desktop
+metacity-wm.desktop
 metacity.schemas
 libmetacity-private.pc
 testasyncgetprop

Modified: branches/gnome-2-24/src/Makefile.am
==============================================================================
--- branches/gnome-2-24/src/Makefile.am	(original)
+++ branches/gnome-2-24/src/Makefile.am	Mon Sep  8 20:38:35 2008
@@ -192,7 +192,7 @@
           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