Merge branch 'master' of github.com:M66B/NetGuard

Conflicts:
	README.md
This commit is contained in:
M66B 2016-03-25 08:01:16 +01:00
commit 49dc664df4
1 changed files with 1 additions and 0 deletions

View File

@ -201,6 +201,7 @@ Building is simple, if you install the right tools:
The native code is built as part of the Android Studio project.
It is expected that you can solve build problems yourself, so there is no support on building.
It builds fine on Linux so one can use [VirtualBox](http://virtualbox.org) + [Lubuntu](http://lubuntu.net) + [Android Studio package](https://paolorotolo.github.io/android-studio/) to get a VM setup that is known to be working.
If you cannot build yourself, there are prebuilt versions of NetGuard available [here](https://github.com/M66B/NetGuard/releases).
*Translating*