Jimmy Shih f5085b208d merge heads

2012-04-06 10:54:22 -07:00

..

.settings

Change "min pace" wording to "max pace".

2012-03-12 16:35:11 -07:00

libs

merge heads

2012-04-06 10:54:22 -07:00

res

merge heads

2012-04-06 10:54:22 -07:00

src/com

merge heads

2012-04-06 10:54:22 -07:00

.classpath

merge heads

2012-04-06 10:54:22 -07:00

.project

Change "min pace" wording to "max pace".

2012-03-12 16:35:11 -07:00

AndroidManifest.xml

merge heads

2012-04-06 10:54:22 -07:00

lint.xml

Change "min pace" wording to "max pace".

2012-03-12 16:35:11 -07:00

MyTracks.launch

Change "min pace" wording to "max pace".

2012-03-12 16:35:11 -07:00

proguard.cfg

merge heads

2012-04-06 10:54:22 -07:00

project.properties

Change "min pace" wording to "max pace".

2012-03-12 16:35:11 -07:00