Merge heads

This commit is contained in:
Rodrigo Damazio
2011-10-21 20:26:43 -02:00
14 changed files with 240 additions and 114 deletions
-1
View File
@@ -5,7 +5,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
<classpathentry kind="src" path="gen"/>
<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
+1 -1
View File
@@ -8,5 +8,5 @@
# project structure.
# Project target.
target=android-10
target=android-14
android.library.reference.1=../MyTracksLib