# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279812694 -3600
# Node ID d93ef1df440d83834876f166d84d699378fbf00c
# Parent  6d7ae91094e7c942dbbbd268cf7649fda34ab443# Parent  3035d69b481d77967a5824935d58a2fa971708d0
Catchup to latest Symbian^4

diff -r 3035d69b481d -r d93ef1df440d build/properties.xml
diff -r 3035d69b481d -r d93ef1df440d inc/java_s60_release.hrh
--- a/inc/java_s60_release.hrh	Fri Jul 16 13:40:08 2010 +0100
+++ b/inc/java_s60_release.hrh	Thu Jul 22 16:31:34 2010 +0100
@@ -1,1 +1,1 @@
-RD_JAVA_S60_RELEASE=10.1
+RD_JAVA_S60_RELEASE=10.1
diff -r 3035d69b481d -r d93ef1df440d javamanager/javaupgradeapp/src.s60/javaupgradeapp.cpp
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/build/build.xml
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/build/javam3g.pro
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/javasrc/javax/microedition/m3g/Graphics3D.java
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/javasrc/javax/microedition/m3g/Image2D.java
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/javasrc/javax/microedition/m3g/Interface.java
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/javasrc/javax/microedition/m3g/Loader.java
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/src/jni/graphics3d.inl
diff -r 3035d69b481d -r d93ef1df440d javauis/m3g_qt/src/jni/interface.inl