merge heads

This commit is contained in:
Jimmy Shih
2012-03-12 16:07:03 -07:00
parent cc07db0269
commit 2da8525439
9 changed files with 27 additions and 29 deletions
+1 -1
View File
@@ -10,6 +10,6 @@
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
<classpathentry kind="lib" path="libs/robotium-solo-2.1.jar" />
<classpathentry kind="lib" path="libs/robotium-solo-3.1.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>