merge heads

2012-04-06 10:55:58 -07:00
parent afa2dd2c0e
commit 6c7131f2a8
54 changed files with 1513 additions and 1543 deletions
@@ -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>