summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordllud <dllud@riseup.net>2019-12-24 01:52:40 +0000
committerdllud <dllud@riseup.net>2019-12-24 01:52:40 +0000
commitc50dfdd22bc5e18cf04a7eb275fb3f51b27cbd60 (patch)
tree8faa12af3e260c784347a1bb598418d10d74edcb
parent4aae4eb3d83ec7c48204a10703d2590e0ba13f9d (diff)
downloadwebview-presentation-c50dfdd22bc5e18cf04a7eb275fb3f51b27cbd60.tar.gz
webview-presentation-c50dfdd22bc5e18cf04a7eb275fb3f51b27cbd60.tar.bz2
webview-presentation-c50dfdd22bc5e18cf04a7eb275fb3f51b27cbd60.zip
Re-arrange licenses slides.
-rw-r--r--slides.tex24
1 files changed, 7 insertions, 17 deletions
diff --git a/slides.tex b/slides.tex
index 0a3556e..2dd847a 100644
--- a/slides.tex
+++ b/slides.tex
@@ -367,16 +367,6 @@ public class MainActivity extends Activity {
EteSync logo & \url{https://github.com/etesync/android} & GPLv3 \\
Syncthing logo & \url{https://github.com/syncthing/syncthing-android} & MPLv2 \\
Briar logo & \url{https://code.briarproject.org/briar/briar} & GPLv3 \\
- \end{tabular}
- }
-\end{frame}
-
-\begin{frame}
- \frametitle{Licenses (II)}
- {\scriptsize
- \begin{tabular}{l | l | l}
- item & source & license \\
- \hline
Conversations logo & \url{https://github.com/siacs/Conversations} & GPLv3 \\
Signal logo & \url{https://github.com/signalapp/Signal-Android} & GPLv3 \\
Silence logo & \url{https://git.silence.dev/Silence/Silence-Android} & GPLv3 \\
@@ -384,13 +374,6 @@ public class MainActivity extends Activity {
KeePass DX logo & \url{https://github.com/Kunzisoft/KeePassDX} & GPLv3 \\
dandelion* logo & \url{https://github.com/gsantner/dandelion} & GPLv3 \\
Nomad logo & \url{https://framagit.org/disroot/AndHub} & GPLv3 \\
- Tusky logo & \url{https://github.com/tuskyapp/Tusky} & GPLv3 \\
- Movim logo & \url{https://github.com/movim/movim_android} & AGPLv3 \\
- Jami logo & \url{https://git.jami.net/savoirfairelinux/ring-client-android} & GPLv3 \\
- Bitmask logo & \url{https://0xacab.org/leap/bitmask_android} & GPLv3 \\
- WireGuard logo & \url{https://git.zx2c4.com/wireguard-android} & Apache-2.0 \\
- Fennec F-Droid logo & \url{https://hg.mozilla.org/releases/mozilla-esr68} & MPL-2.0 \\
- Tor Browser logo & \url{https://gitweb.torproject.org/tor-browser.git} & MPL-2.0 \\
\end{tabular}
}
\end{frame}
@@ -401,6 +384,13 @@ public class MainActivity extends Activity {
\begin{tabular}{l | l | l}
item & source & license \\
\hline
+ Tusky logo & \url{https://github.com/tuskyapp/Tusky} & GPLv3 \\
+ Movim logo & \url{https://github.com/movim/movim_android} & AGPLv3 \\
+ Jami logo & \url{https://git.jami.net/savoirfairelinux/ring-client-android} & GPLv3 \\
+ Bitmask logo & \url{https://0xacab.org/leap/bitmask_android} & GPLv3 \\
+ WireGuard logo & \url{https://git.zx2c4.com/wireguard-android} & Apache-2.0 \\
+ Fennec logo & \url{https://hg.mozilla.org/releases/mozilla-esr68} & MPL-2.0 \\
+ Tor Browser logo & \url{https://gitweb.torproject.org/tor-browser.git} & MPL-2.0 \\
Thorium logo & \url{https://github.com/sschueller/peertube-android} & AGPLv3 \\
WebKit logo & \url{https://en.wikipedia.org/wiki/File:WebKit_logo_(2015).svg} & non-free \\
Chromium logo & \url{https://commons.wikimedia.org/wiki/File:Chromium_11_Logo.svg} & CC-BY 2.5 \\