r1533 - trunk/oe/conf/distro/include

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-03-28 17:00:52 +0200 (Wed, 28 Mar 2007)
New Revision: 1533

Modified:
   trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
Log:
oe/conf: resolve merge conflict


Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2007-03-28 14:58:00 UTC (rev 1532)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2007-03-28 15:00:52 UTC (rev 1533)
@@ -26,6 +26,11 @@
 SRCDATE_openmoko-libs = "now"
 
 #
+# Input Methods
+#
+SRCDATE_openmoko-keyboard = "now"
+
+#
 # Examples
 #
 SRCDATE_openmoko-stylus-demo = "now"
@@ -40,6 +45,9 @@
 SRCDATE_openmoko-contacts = "now"
 SRCDATE_openmoko-dates = "now"
 SRCDATE_openmoko-today = "now"
+SRCDATE_openmoko-messages = "now"
+SRCDATE_openmoko-rssreader = "now"
+SRCDATE_openmoko-calculator = "now"
 
 #
 # Applications
@@ -50,9 +58,7 @@
 SRCDATE_openmoko-footer = "now"
 SRCDATE_openmoko-phone = "now"
 SRCDATE_openmoko-mainmenu = "now"
-SRCDATE_openmoko-messages = "now"
 SRCDATE_openmoko-taskmanager = "now"
-SRCDATE_openmoko-keyboard = "now"
 
 #
 # Multimedia