damned-lies r827 - trunk

[claudep svn gnome org]

Author: claudep
Date: Fri Mar 28 09:24:54 2008
New Revision: 827
URL: http://svn.gnome.org/viewvc/damned-lies?rev=827&view=rev

Log:
2008-03-28  Claude Paroz  <claude 2xlibre net>

	* gnome-modules.xml.in:
	* releases.xml.in: gnome-settings-daemon and gnome-control-center branched
	for 2.22.

Modified:
   trunk/ChangeLog
   trunk/gnome-modules.xml.in
   trunk/releases.xml.in

Modified: trunk/gnome-modules.xml.in
==============================================================================
--- trunk/gnome-modules.xml.in	(original)
+++ trunk/gnome-modules.xml.in	Fri Mar 28 09:24:54 2008
@@ -654,11 +654,12 @@
     <branch id="HEAD"/>
   </module>
   <module id="gnome-control-center">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD" stringfrozen="false"/>
     <branch id="gnome-2-14" stringfrozen="true"/>
     <branch id="gnome-2-16" stringfrozen="true"/>
     <branch id="gnome-2-18" stringfrozen="true"/>
     <branch id="gnome-2-20" stringfrozen="true"/>
+    <branch id="gnome-2-22" stringfrozen="true"/>
   </module>
   <module id="gnome-cups-manager">
     <branch id="HEAD"/>
@@ -966,7 +967,8 @@
     <branch id="gnome-2-22" stringfrozen="true"/>
   </module>
   <module id="gnome-settings-daemon">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD" stringfrozen="false"/>
+    <branch id="gnome-2-22" stringfrozen="true"/>
   </module>
   <module id="gnome-sharing">
     <branch id="HEAD"/>

Modified: trunk/releases.xml.in
==============================================================================
--- trunk/releases.xml.in	(original)
+++ trunk/releases.xml.in	Fri Mar 28 09:24:54 2008
@@ -575,7 +575,7 @@
       <module id="gedit"/>
       <module id="gnome-applets" branch="gnome-2-22"/>
       <module id="gnome-backgrounds"/>
-      <module id="gnome-control-center"/>
+      <module id="gnome-control-center" branch="gnome-2-22"/>
       <module id="gnome-desktop"/>
       <module id="gnome-doc-utils"/>
       <module id="gnome-games" branch="gnome-2-22"/>
@@ -590,7 +590,7 @@
       <module id="gnome-power-manager" branch="gnome-2-22"/>
       <module id="gnome-screensaver"/>
       <module id="gnome-session" branch="gnome-2-22"/>
-      <module id="gnome-settings-daemon"/>
+      <module id="gnome-settings-daemon" branch="gnome-2-22"/>
       <module id="gnome-system-monitor" branch="gnome-2-22"/>
       <module id="gnome-system-tools"/>
       <module id="gnome-terminal" branch="gnome-2-22"/>