# HG changeset patch
# User John Kern <johnk@symbian.org>
# Date 1260809994 28800
# Node ID ba5cb42d7f027810a5cfe5f86df8808ef84688a1
# Parent  3bf560f85513641cd0c376fd85cfdfbe782fd09b# Parent  1a93ed2e38bd484d72fdaa19792e0f9568455b8a
merged integration branch

diff -r 3bf560f85513 -r ba5cb42d7f02 .hgtags
--- a/.hgtags	Thu Nov 12 14:39:23 2009 -0800
+++ b/.hgtags	Mon Dec 14 08:59:54 2009 -0800
@@ -1,1 +1,3 @@
 5c4b0c1fa5f84f299d50ad82f561454aa109a2a4 PDK_3.0.b
+c506b18dc03fca6edca100e3b2cd2ae4c175215c PDK_3.0.c
+c506b18dc03fca6edca100e3b2cd2ae4c175215c PDK_2.0.1
diff -r 3bf560f85513 -r ba5cb42d7f02 baseport/syborg/bld.inf
--- a/baseport/syborg/bld.inf	Thu Nov 12 14:39:23 2009 -0800
+++ b/baseport/syborg/bld.inf	Mon Dec 14 08:59:54 2009 -0800
@@ -105,3 +105,10 @@
 option		EXTRA_INC_PATH	$(EXTENSION_ROOT)/bootstrap
 option		EXTRA_SRC_PATH	$(EXTENSION_ROOT)/bootstrap 
 end
+
+// Build image armv5 for urel and udeb
+PRJ_EXTENSIONS
+start	extension	base/rom
+option	REE_TARGET	syborg
+option	TYPE	tshell
+end