gnome-desktop r5121 - in trunk: . libgnome-desktop libgnome-desktop/libgnomeui

[ssp svn gnome org]

Author: ssp
Date: Tue Jun 17 23:36:33 2008
New Revision: 5121
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5121&view=rev

Log:
Tue Jun 17 19:35:39 2008  SÃren Sandmann  <sandmann redhat com>

	* Merge randr-12 branch



Added:
   trunk/libgnome-desktop/display-name.c
      - copied unchanged from r5120, /branches/randr-12/libgnome-desktop/display-name.c
   trunk/libgnome-desktop/edid-parse.c
      - copied unchanged from r5120, /branches/randr-12/libgnome-desktop/edid-parse.c
   trunk/libgnome-desktop/edid.h
      - copied unchanged from r5120, /branches/randr-12/libgnome-desktop/edid.h
   trunk/libgnome-desktop/gnome-rr-config.c
      - copied unchanged from r5120, /branches/randr-12/libgnome-desktop/gnome-rr-config.c
   trunk/libgnome-desktop/gnome-rr.c
      - copied unchanged from r5120, /branches/randr-12/libgnome-desktop/gnome-rr.c
   trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h
      - copied unchanged from r5120, /branches/randr-12/libgnome-desktop/libgnomeui/gnome-rr-config.h
   trunk/libgnome-desktop/libgnomeui/gnome-rr.h
      - copied unchanged from r5120, /branches/randr-12/libgnome-desktop/libgnomeui/gnome-rr.h
Modified:
   trunk/ChangeLog
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/Makefile.am
   trunk/libgnome-desktop/libgnomeui/Makefile.am

Modified: trunk/libgnome-desktop/Makefile.am
==============================================================================
--- trunk/libgnome-desktop/Makefile.am	(original)
+++ trunk/libgnome-desktop/Makefile.am	Tue Jun 17 23:36:33 2008
@@ -20,7 +20,12 @@
 	gnome-desktop-item.c	\
 	gnome-ditem-edit.c	\
 	gnome-hint.c		\
-	gnome-bg.c
+	gnome-bg.c		\
+	display-name.c		\
+	gnome-rr.c		\
+	gnome-rr-config.c	\
+	edid-parse.c		\
+	edid.h
 
 libgnome_desktop_2_la_LIBADD =	\
 	$(XLIB_LIBS)		\

Modified: trunk/libgnome-desktop/libgnomeui/Makefile.am
==============================================================================
--- trunk/libgnome-desktop/libgnomeui/Makefile.am	(original)
+++ trunk/libgnome-desktop/libgnomeui/Makefile.am	Tue Jun 17 23:36:33 2008
@@ -1,5 +1,7 @@
 libgnomeui_desktopdir = $(includedir)/gnome-desktop-2.0/libgnomeui
-libgnomeui_desktop_HEADERS = \
-	gnome-ditem-edit.h \
-	gnome-hint.h       \
-	gnome-bg.h
+libgnomeui_desktop_HEADERS =	\
+	gnome-ditem-edit.h	\
+	gnome-hint.h		\
+	gnome-bg.h		\
+	gnome-rr.h		\
+	gnome-rr-config.h