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
..
drawable	Added warning icon to Warning screen	2011-06-14 22:38:14 +05:30
layout	Merge branch 'wizard'	2011-07-24 17:09:30 -04:00
layout-land	tweaking layout for small screens	2011-05-17 02:03:07 +00:00
raw	new values for 0.0.0.0 binding	2011-06-02 16:21:25 -04:00
values	Merge branch 'wizard'	2011-07-24 17:09:30 -04:00
values-ar	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-ca	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-de	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-es	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-fa	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-mk	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-nb	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-nl	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-pl	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-pt	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-ru	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-sv	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
values-zh	updated changelog and res strings version num	2011-05-17 03:08:30 +00:00
xml	new UI strings for tethering support	2011-06-02 16:21:38 -04:00