Changeset 11527 for issm/trunk/externalpackages/android

Timestamp:

02/24/12 08:12:47 (14 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11526

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• externalpackages/android (copied) (copied from issm/trunk-jpl/externalpackages/android )
• externalpackages/android/HelloWorldAppProject (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject )
• externalpackages/android/HelloWorldAppProject/AndroidManifest.xml (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/AndroidManifest.xml )
• externalpackages/android/HelloWorldAppProject/ant.properties (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/ant.properties )
• externalpackages/android/HelloWorldAppProject/bin (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin )
• externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk )
• externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk.d (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk.d )
• externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug.apk (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug.apk )
• externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_ (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_ )
• externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_.d (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_.d )
• externalpackages/android/HelloWorldAppProject/bin/build.prop (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/build.prop )
• externalpackages/android/HelloWorldAppProject/bin/classes (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes )
• externalpackages/android/HelloWorldAppProject/bin/classes.dex (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex )
• externalpackages/android/HelloWorldAppProject/bin/classes.dex.d (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex.d )
• externalpackages/android/HelloWorldAppProject/bin/classes/com (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com )
• externalpackages/android/HelloWorldAppProject/bin/classes/com/example (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example )
• externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld )
• externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/HelloWorldAppActivity.class (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/HelloWorldAppActivity.class )
• externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$attr.class (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$attr.class )
• externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$layout.class (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$layout.class )
• externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$string.class (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$string.class )
• externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R.class (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R.class )
• externalpackages/android/HelloWorldAppProject/bin/res (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/res )
• externalpackages/android/HelloWorldAppProject/build.xml (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/build.xml )
• externalpackages/android/HelloWorldAppProject/gen (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen )
• externalpackages/android/HelloWorldAppProject/gen/R.java.d (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/R.java.d )
• externalpackages/android/HelloWorldAppProject/gen/com (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com )
• externalpackages/android/HelloWorldAppProject/gen/com/example (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example )
• externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld )
• externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld/R.java (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld/R.java )
• externalpackages/android/HelloWorldAppProject/libs (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/libs )
• externalpackages/android/HelloWorldAppProject/proguard.cfg (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/proguard.cfg )
• externalpackages/android/HelloWorldAppProject/project.properties (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/project.properties )
• externalpackages/android/HelloWorldAppProject/res (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res )
• externalpackages/android/HelloWorldAppProject/res/layout (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout )
• externalpackages/android/HelloWorldAppProject/res/layout/main.xml (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout/main.xml )
• externalpackages/android/HelloWorldAppProject/res/values (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values )
• externalpackages/android/HelloWorldAppProject/res/values/strings.xml (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values/strings.xml )
• externalpackages/android/HelloWorldAppProject/src (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src )
• externalpackages/android/HelloWorldAppProject/src/com (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com )
• externalpackages/android/HelloWorldAppProject/src/com/example (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example )
• externalpackages/android/HelloWorldAppProject/src/com/example/helloworld (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld )
• externalpackages/android/HelloWorldAppProject/src/com/example/helloworld/HelloWorldAppActivity.java (copied) (copied from issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld/HelloWorldAppActivity.java )
• externalpackages/android/README (copied) (copied from issm/trunk-jpl/externalpackages/android/README )