merge heads

This commit is contained in:
Jimmy Shih
2012-04-03 13:02:35 -07:00
parent 4b8d4e92b8
commit 12f17e6f49
16 changed files with 87 additions and 54 deletions
-2
View File
@@ -9,8 +9,6 @@
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
<classpathentry kind="lib" path="libs/robotium-solo-3.1.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>