Merge heads

2011-10-21 20:26:43 -02:00
parent ac652cbbd7 2eee3c1c3e
commit 44f53dabed
14 changed files with 240 additions and 114 deletions
@@ -5,6 +5,5 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
@@ -10,4 +10,4 @@
 android.library.reference.1=../MyTracksLib/
 proguard.config=proguard.cfg
 # Project target.
-target=android-10
+target=android-14