Merge branch 'racecommittee_integrated' of ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

This commit is contained in:
Armin Zamani committed 2013-01-16 19:49:48 +01:00
commit ac7b543cf8
5 files changed
+44 -6

No files matched your search

+3 -6
View File
@@ -7,10 +7,7 @@ manifest.txt
java/com.sap.sailing.gwt.ui/gwt-unitCache/*
java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/*
sailing_debug0*
/mobile\com.sap.sailing.racecommittee.glue\bin/AndroidManifest.xml
/mobile\com.sap.sailing.racecommittee.glue\bin/com.sap.sailing.racecommittee.glue.jar
/mobile\com.sap.sailing.racecommittee.glue\bin/jarlist.cache
/mobile/com.sap.sailing.racecommittee.glue/bin/com.sap.sailing.racecommittee.glue.jar
/java/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.glue/bin/com.sap.sailing.racecommittee.glue.jar
/mobile/com.sap.sailing.racecommittee.glue/bin/jarlist.cache
/mobile/com.sap.sailing.racecommittee.app/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.app/bin/*
/mobile/com.sap.sailing.racecommittee.app/gen/*
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.sap.sailing.racecommittee.app</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Whitespace-only changes.
Whitespace-only changes.