Jimmy Shih f5eebb1b87 merge heads

2011-11-15 17:32:29 -08:00

..

.settings

Merged to head

2011-11-14 23:27:04 -02:00

assets

Fix for the signed/unsigned ANT+ device-id bug

2011-11-14 12:29:11 +11:00

libs

Fix for the signed/unsigned ANT+ device-id bug

2011-11-14 12:29:11 +11:00

res

merge heads

2011-11-15 16:43:45 -08:00

src/com

merge heads

2011-11-15 17:32:29 -08:00

.classpath

Merged to head

2011-11-14 23:27:04 -02:00

.project

Merged to head

2011-11-14 23:27:04 -02:00

AndroidManifest.xml

merge heads

2011-11-15 16:43:45 -08:00

MyTracks.launch

Fix for the signed/unsigned ANT+ device-id bug

2011-11-14 12:29:11 +11:00

proguard.cfg

Merged to head

2011-11-14 23:27:04 -02:00

project.properties

Merged to head

2011-11-14 23:27:04 -02:00