Nathan Freitas f255420782 Merge branch 'kensan/obfsbridge-prefs' into obfs ... Conflicts: src/org/torproject/android/service/TorService.java		2012-02-12 13:05:19 -05:00
..
drawable	cleaned up notify icons	2012-01-25 20:05:43 -05:00
layout	updated version strings	2012-01-09 00:22:16 -05:00
layout-land	small layout tweaks for tablets	2011-11-13 10:39:08 -05:00
layout-xlarge	moved layout for high-res screens	2012-01-09 01:38:56 -05:00
raw	moved bridge config out of torrc into applyPrefs()	2012-02-12 12:29:11 -05:00
values	Add strings and prefs related to obfuscated bridges	2012-02-12 13:19:34 +01:00
values-ar	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-ca	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-de	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-es	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-fa	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-mk	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-nb	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-nl	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-pl	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-pt	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-ru	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-sv	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
values-zh	updated layout, strings, and graphics	2011-10-28 00:31:26 -04:00
xml	Add strings and prefs related to obfuscated bridges	2012-02-12 13:19:34 +01:00