Jimmy Shih 65991ba512 merge heads

2011-11-15 16:42:33 -08:00

..

.settings

Merged to head

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

assets

Rename and reorganize menu variables in strings.xml

2011-11-07 17:53:22 -08:00

libs

Rename and reorganize menu variables in strings.xml

2011-11-07 17:53:22 -08:00

res

Merged to head

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

src/com

Merged to head

2011-11-14 23:27:04 -02: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

Merged to head

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

MyTracks.launch

Rename and reorganize menu variables in strings.xml

2011-11-07 17:53:22 -08: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