Merge branch 'master' into navdrawer-api

Browse Source

Conflicts:
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java

...

This commit is contained in:

fkloft

2013-12-03 23:48:54 +01:00

parent 6c0327b01c 270705cf6c

commit 0dcc9bfd7e

138 changed files with 130 additions and 139 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

BIN

mobile/res/drawable-mdpi/action_about.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/action_search.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/action_settings.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/alerts_and_states_warning.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/av_full_screen.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/browser.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/collections_view_as_list.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/content_remove.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/copy.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/device_access_location_found.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/drawer_shadow.9.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 158 B

BIN

mobile/res/drawable-mdpi/ic_action_about.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 434 B

BIN

mobile/res/drawable-mdpi/ic_action_add_to_queue.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 303 B

BIN

mobile/res/drawable-mdpi/ic_action_cc_bcc.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 497 B

BIN

mobile/res/drawable-mdpi/ic_action_copy.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 288 B

BIN

mobile/res/drawable-mdpi/ic_action_error.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 299 B

BIN

mobile/res/drawable-mdpi/ic_action_full_screen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 461 B

BIN

mobile/res/drawable-mdpi/ic_action_group.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 543 B

BIN

mobile/res/drawable-mdpi/ic_action_location_found.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 460 B

BIN

mobile/res/drawable-mdpi/ic_action_map.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 603 B

BIN

mobile/res/drawable-mdpi/ic_action_refresh.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 492 B

BIN

mobile/res/drawable-mdpi/ic_action_search.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 449 B

BIN

mobile/res/drawable-mdpi/ic_action_settings.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 601 B

BIN

mobile/res/drawable-mdpi/ic_action_share.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 418 B

BIN

mobile/res/drawable-mdpi/ic_action_view_as_list.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 246 B

0

mobile/res/drawable-mdpi/collections_view_as_list_compact.png → mobile/res/drawable-mdpi/ic_action_view_as_list_compact.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 334 B After Width:  |  Height:  |  Size: 334 B

BIN

mobile/res/drawable-mdpi/ic_action_warning.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 410 B

BIN

mobile/res/drawable-mdpi/ic_action_web_site.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 733 B

BIN

mobile/res/drawable-mdpi/ic_debug.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/ic_drawer.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/ic_layer_chooser.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/location_map.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/navigation_refresh.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/share.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/social_cc_bcc.png

Binary file not shown.

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

BIN

mobile/res/drawable-mdpi/social_group.png

Binary file not shown.

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