Skip to content

Commit

Permalink
Merge pull request SecUSo#11 from RyDroid/minor-txt
Browse files Browse the repository at this point in the history
Minor changes in plain-text files
  • Loading branch information
Yonjuni authored Jul 4, 2017
2 parents 9d21f10 + 15bd71d commit 38e90a8
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
9 changes: 4 additions & 5 deletions LICENSE → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -646,7 +646,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -665,12 +665,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

<https://www.gnu.org/philosophy/why-not-lgpl.html>.
21 changes: 13 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ This app is optimized regarding the user's privacy. It doesn't use any tracking

Privacy Friendly Torchlight belongs to the group of Privacy Friendly Apps and has been developed to provide a privacy friendly torchlight application.

## Building
## Download and more Information

Further development requires Android Studio, we recommend to use at least version 2.1.3
[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="60" />](https://f-droid.org/repository/browse/?fdid=com.secuso.torchlight2)
<a href="https://play.google.com/store/apps/details?id=com.secuso.torchlight2"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="60" /></a>

### Building

Further development requires Android Studio, we recommend to use at least version 2.1.3.

### API Reference

Mininum SDK: 16
Target SDK: 25
- Mininum SDK: 16
- Target SDK: 25

## License

Expand All @@ -27,7 +32,7 @@ This program is free software: you can redistribute it and/or modify it under th

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.
You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/.

The icons used in the nagivation drawer are licensed under the CC BY 2.5. In addition to them the app uses icons from Google Design Material Icons licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the app logos and splash icon) copyright Technische Universtität Darmstadt (2016).

Expand All @@ -36,7 +41,7 @@ The icons used in the nagivation drawer are licensed under the CC BY 2.5. In add
App-Icons:
Markus Hau

Github-Users: <br />
p-rack <br />
Kamuno <br />
Users of GitHub:<br />
p-rack<br />
Kamuno<br />
Yonjuni

0 comments on commit 38e90a8

Please sign in to comment.