Mercurial Mercurial > oss > FCL > sf > app > jrt / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:09:01 +0000
branchCompilerCompatibility
changeset 11 0fdfe802150c
parent 9 3b04987a4caf (current diff)
parent 8 014f8c42e1d4 (diff)
child 14 64bf9e47f05e
Automatic merge from PDK_3.0.h
bld.inf file | annotate | diff | comparison | revisions
group/bld.inf file | annotate | diff | comparison | revisions
java_stubs/group/bld.inf file | annotate | diff | comparison | revisions
java_stubs/javaregistry/clientserver/client/inc/javaattributes.h file | annotate | diff | comparison | revisions
java_stubs/javaregistry/clientserver/client/inc/javaregclient.h file | annotate | diff | comparison | revisions
java_stubs/javaregistry/clientserver/common/inc/javapropertyarray.h file | annotate | diff | comparison | revisions
java_stubs/javaregistry/clientserver/common/inc/javaregburstates.h file | annotate | diff | comparison | revisions
java_stubs/javaregistry/clientserver/common/inc/javaregdef.h file | annotate | diff | comparison | revisions
java_stubs/javaregistry/clientserver/common/inc/javaregproperty.h file | annotate | diff | comparison | revisions
java_stubs/javaregistry/clientserver/common/inc/javareguidarrayconv.h file | annotate | diff | comparison | revisions
java_stubs/rom/javastubs.iby file | annotate | diff | comparison | revisions
jrt_plat/java_registry_api/inc/appversion.inl file | annotate | diff | comparison | revisions
layers.sysdef.xml file | annotate | diff | comparison | revisions 
--- a/jrt_plat/java_debug_api/java_debug_api.metaxml	Mon Mar 08 21:43:15 2010 +0000
+++ b/jrt_plat/java_debug_api/java_debug_api.metaxml	Sun Mar 14 13:09:01 2010 +0000
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <api id="fb4b8d56e86ecb8152a0d3b2be8880c8" dataversion="2.0">
   <name>Java Debug API</name>
-  <description>Java Debug API allows it's users to install, remove, start and stop Java applications. Java application can be launched with Universal Emulator Interface (UEI) arguments that can be used to start JVM in debug mode.</description>
+  <description>Java Debug API allows its users to install, remove, start and stop Java applications. Java application can be launched with Universal Emulator Interface (UEI) arguments that can be used to start JVM in debug mode.</description>
   <type>c++</type>
   <collection>javamanager</collection>
   <libs>
--- a/jrt_plat/java_env_info_api/java_env_info_api.metaxml	Mon Mar 08 21:43:15 2010 +0000
+++ b/jrt_plat/java_env_info_api/java_env_info_api.metaxml	Sun Mar 14 13:09:01 2010 +0000
@@ -1,17 +1,14 @@
 <?xml version="1.0" ?>
-<api id="935dbdc2b6dfe73953cf5cc603647d36" dataversion="1.0">
+<api id="935dbdc2b6dfe73953cf5cc603647d36" dataversion="2.0">
   <name>Java Environment Info API</name>
   <description>This API provides information about the Java environment and events occurring within it</description>
   <type>c++</type>
-  <subsystem>java_dom</subsystem>
+  <collection>javacommons</collection>
   <libs>
     <lib name="javaenv.lib" />  
   </libs>
-  <release category="domain"/>
+  <release category="platform" sinceversion="3.2"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
--- a/jrt_plat/java_registry_api/java_registry_api.metaxml	Mon Mar 08 21:43:15 2010 +0000
+++ b/jrt_plat/java_registry_api/java_registry_api.metaxml	Sun Mar 14 13:09:01 2010 +0000
@@ -9,9 +9,6 @@
   </libs>
   <release category="platform" sinceversion="3.2"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
FCL/sf/app/jrt