merge heads

Browse Source

...

This commit is contained in:

Jimmy Shih

2013-06-21 13:32:32 -07:00

parent 429b13664d 97c72dfafd

commit d2243ccabc

28 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

MyTracks/res/drawable-mdpi/menu_map_layer.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

MyTracks/res/drawable-mdpi/tab_chart.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 50 KiB After Width:  |  Height:  |  Size: 50 KiB

MyTracks/res/drawable-mdpi/track_bike.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

MyTracks/res/drawable-mdpi/track_drive.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

MyTracks/res/drawable-mdpi/track_run.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

MyTracks/res/drawable-mdpi/track_ski.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

MyTracks/res/drawable-mdpi/track_walk.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

MyTracks/res/drawable-mdpi/warning.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

MyTracks/res/drawable-mdpi/yellow_pushpin.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 58 KiB After Width:  |  Height:  |  Size: 58 KiB