From 9823ab39ea5473e7e08ad2d1a08f5b876931f80b Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Fri, 28 Apr 2017 17:57:53 +0800 Subject: [PATCH] Added Open Source Licenses --- README.md | 46 +++++++++++--------- app/src/main/assets/about_html/index.html | 23 ++++++++-- app/src/main/assets/about_html/index_zh.html | 23 ++++++++-- 3 files changed, 66 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index a39b9b0..1f17990 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,7 @@ iTXTech Daedalus -============== - +=============== __See the world outside through a CLEAN DNS.__ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - 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 . - Introduction ------------- This application can create a VPN tunnel to modify the DNS settings on Android.
@@ -42,9 +28,29 @@ Get Daedalus ------------- __[Releases](https://github.com/iTXTech/Daedalus/releases)__ -Acknowledgements +Open Source Licenses ------------- -* __[ClearEditText](https://github.com/MrFuFuFu/ClearEditText)__ by *[MrFuFuFu](https://github.com/MrFuFuFu)* -* __[DNS66](https://github.com/julian-klode/dns66)__ by *[julian-klode](https://github.com/julian-klode)* -* __[hosts](https://github.com/racaljk/hosts)__ by *[racaljk](https://github.com/racaljk)* - Licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh) -* __[google-hosts](https://github.com/fengixng/google-hosts)__ by *[fengixng](https://github.com/fengixng)* \ No newline at end of file +* __[ClearEditText](https://github.com/MrFuFuFu/ClearEditText)__ by *[Yuan Fu](https://github.com/MrFuFuFu)* - None +* __[DNS66](https://github.com/julian-klode/dns66)__ by *[Julian Andres Klode](https://github.com/julian-klode)* - [GPLv3](https://github.com/julian-klode/dns66/blob/master/COPYING) +* __[Pcap4J](https://github.com/kaitoy/pcap4j)__ by *[Kaito Yamada](https://github.com/kaitoy)* - [MIT](https://github.com/kaitoy/pcap4j) +* __[MiniDNS](https://github.com/rtreffer/minidns)__ by *[Rene Treffer](https://github.com/rtreffer)* - [LGPLv2.1](https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1) +* __[hosts](https://github.com/racaljk/hosts)__ by *[Cthulhu](https://github.com/racaljk)* - [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh) +* __[google-hosts](https://github.com/fengixng/google-hosts)__ by *[fengixng](https://github.com/fengixng)* - None + +License +------------ +Copyright (C) 2017 by iTXTech <[admin@itxtech.org](mailto:admin@itxtech.org)>
+Copyright (C) 2017 by PeratX <[peratx@itxtech.org](mailto:peratx@itxtech.org)> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + 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 . \ No newline at end of file diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html index a0e324b..4fc7d6a 100644 --- a/app/src/main/assets/about_html/index.html +++ b/app/src/main/assets/about_html/index.html @@ -59,14 +59,16 @@

AIXYZ DNS is for academic purposes only!
-
- Users must comply with local laws and regulations.
+
Users must comply with local laws and regulations.
+
Copyright (C) 2017 by iTXTech admin@itxtech.org +
+
Copyright (C) 2017 by PeratX peratx@itxtech.org


This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as + it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
@@ -79,5 +81,20 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
+
+
+
Open Source Licenses
+
+
+ ClearEditText: None
+ DNS66: GPLv3
+ Pcap4J: MIT
+ MiniDNS: LGPLv2.1
+ hosts: CC BY-NC-SA 4.0
+ google-hosts: None
+
\ No newline at end of file diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html index 0a952a4..35dd5e5 100644 --- a/app/src/main/assets/about_html/index_zh.html +++ b/app/src/main/assets/about_html/index_zh.html @@ -59,14 +59,16 @@

AIXYZ DNS 仅限用于学术目的！
-
- 使用者必须遵守当地法律法规。
+
使用者必须遵守当地法律法规。
+
Copyright (C) 2017 by iTXTech admin@itxtech.org +
+
Copyright (C) 2017 by PeratX peratx@itxtech.org


This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as + it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
@@ -79,5 +81,20 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
+
+
+
Open Source Licenses
+
+
+ ClearEditText: None
+ DNS66: GPLv3
+ Pcap4J: MIT
+ MiniDNS: LGPLv2.1
+ hosts: CC BY-NC-SA 4.0
+ google-hosts: None
+
\ No newline at end of file