Nathan Freitas cd6c533a71 Merge branch 'wizard' ... Conflicts: res/values/strings.xml src/org/torproject/android/Orbot.java		2011-07-24 17:09:30 -04:00
..
layout_about.xml	updated strings files with version number	2011-05-16 03:49:36 +00:00
layout_apps.xml	fixed permission issues; added green notification icon; improved root/su checking logic	2010-09-21 01:26:40 +00:00
layout_apps_item.xml	Wizard UI/UX Refresh	2011-06-13 01:11:46 +05:30
layout_help.xml	multiple updates related to pending 0.0.8 including fixes for trac #1388 #1509 #1530 #1513 #1333	2010-07-19 22:34:15 +00:00
layout_log.xml	fixes #1947 bug; adds Start on Boot option; v1.0.4-RC5	2010-09-23 19:47:25 +00:00
layout_main.xml	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
layout_settings.xml	0.0.2a update; improved Service mgmt; Control Port callbacks; better UI graphics; Help page	2009-11-30 16:39:13 +00:00
layout_wizard.xml	big checkin for 0.0.8-beta-280710a build with new start wizard, improved ctrlport handling, and root config	2010-07-28 04:43:58 +00:00
layout_wizard_permissions.xml	Merge branch 'wizard'	2011-07-24 17:09:30 -04:00
layout_wizard_proxy_help.xml	added new proxy settings layout xml	2010-08-10 16:44:14 +00:00
layout_wizard_root.xml	Merge branch 'wizard'	2011-07-24 17:09:30 -04:00
layout_wizard_stock.xml	big checkin for 0.0.8-beta-280710a build with new start wizard, improved ctrlport handling, and root config	2010-07-28 04:43:58 +00:00
layout_wizard_tips.xml	Merge branch 'wizard'	2011-07-24 17:09:30 -04:00
layout_wizard_welcome.xml	big checkin for 0.0.8-beta-280710a build with new start wizard, improved ctrlport handling, and root config	2010-07-28 04:43:58 +00:00
scrollingtext_buttons_view.xml	Merge branch 'wizard'	2011-07-24 17:09:30 -04:00