3 Commits

Author	SHA1	Message	Date
Nathan Freitas	a6245037b4	remove unneeded wizard classes	2015-02-15 01:22:38 -05:00
Nathan Freitas	5c80572264	Merge branch 'master' of https://github.com/SuppSandroB/Ony into ony-dev ... Conflicts: AndroidManifest.xml jni/Android.mk res/menu/main.xml src/org/torproject/android/OrbotMainActivity.java src/org/torproject/android/service/TorService.java src/org/torproject/android/ui/TipsAndTricks.java src/org/torproject/android/vpn/OrbotVpnService.java src/org/torproject/android/wizard/ConfigureTransProxy.java src/org/torproject/android/wizard/Permissions.java	2015-02-02 13:42:56 -05:00
Nathan Freitas	7c303f1589	refactoring into cleaner packages	2015-02-02 11:04:32 -05:00