Merge pull request #111 from amnezia-vpn/qrcodegen

qzxing removed, Qrcodegen added
amnezia-vpn · Sep 10, 2022 · 47c305d · 47c305d
2 parents 8cea93d + c5ba89b
commit 47c305d
Show file tree

Hide file tree

Showing 15 changed files with 1,433 additions and 116 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,9 +16,6 @@
 [submodule "client/3rd/outline-go-tun2socks"]
 	path = client/3rd/outline-go-tun2socks
 	url = https://github.com/Jigsaw-Code/outline-go-tun2socks.git
-[submodule "client/3rd/qzxing"]
-	path = client/3rd/qzxing
-	url = https://github.com/ftylitak/qzxing.git
 [submodule "client/3rd/CocoaAsyncSocket"]
 	path = client/3rd/CocoaAsyncSocket
 	url = https://github.com/robbiehanson/CocoaAsyncSocket.git

diff --git a/.travis.yml b/.travis.yml
@@ -164,6 +164,7 @@ jobs:
 # ------------------------------------------------------
     - name: Linux
       os: linux
+      language: cpp
       dist: focal
 
       addons: