Merge PDK_2.0.0
authorDario Sestito <darios@symbian.org>
Tue, 13 Oct 2009 17:56:12 +0100
changeset 659 7a343c038e7d
parent 658 dd5f923b7f91 (current diff)
parent 657 4a45293616f5 (diff)
child 660 5a3e7da0fee9
Merge
--- a/common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Application Editor BC tests
+# Script to build ATS test drop Location Acquisition BC tests
 
 
 use strict;
--- a/common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Application Editor BC tests
+# Script to build ATS test drop Landmarks Item Id Db Combi Info BC tests
 
 
 use strict;
--- a/common/tools/ats/bctest/locationsrv/locsel/locsel.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locsel/locsel.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Application Editor BC tests
+# Script to build ATS test drop Landmarks Selector BC tests
 
 
 use strict;
--- a/common/tools/populateziptemplate.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -91,7 +91,7 @@
 			if ($layer eq "QEMU")
 			{
 				$packageName = $layer;
-				$layer = "os";
+				$layer = "adaptation";
 			}
 			else
 			{