Merge heads

Browse Source

...

This commit is contained in:

youtaol

2012-07-06 14:41:50 +08:00

parent 9a24f12e11

commit 812ca57d42

180 changed files with 1201 additions and 737 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/app_widget_button_disabled.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.2 KiB

MyTracks/res/drawable-mdpi/app_widget_button_enabled.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.5 KiB

MyTracks/res/drawable-mdpi/failure.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 676 B After Width:  |  Height:  |  Size: 40 KiB

MyTracks/res/drawable-mdpi/menu_aggregated_statistics.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_import.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_markers.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_satellite_mode.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_show_on_map.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_split_frequency.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_stop_recording.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_voice_frequency.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/success.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 766 B After Width:  |  Height:  |  Size: 40 KiB

MyTracks/res/drawable-mdpi/tab_stats.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/track_airplane.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 41 KiB

MyTracks/res/drawable-mdpi/track_boat.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 44 KiB

MyTracks/res/drawable-mdpi/track_run.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/track_snow_boarding.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 47 KiB

MyTracks/res/drawable-mdpi/app_widget_background.9.png → MyTracks/res/drawable-mdpi/track_widget_background.9.png

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

MyTracks/res/drawable-mdpi/track_widget_record_button.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 40 KiB

MyTracks/res/drawable-mdpi/track_widget_stop_button.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 36 KiB