diff --git a/.gitmodules b/.gitmodules index 5c5b04988..2b7f14f9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "project/lib/webm"] path = project/lib/webm url = https://github.com/native-toolkit/webm +[submodule "project/lib/axtls"] + path = project/lib/axtls + url = https://github.com/native-toolkit/axtls diff --git a/NOTICE.md b/NOTICE.md index 5d7d0af90..ebcc55553 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -4,6 +4,9 @@ Notices ### Lime Copyright (c) 2013-2017 Joshua Granick and other Lime contributors +This product bundles axTLS 1.4.9, which is available under a +"BSD" license. For details, see [project/lib/axtls/](project/lib). + This product bundles cairo 1.15.2, which is available under an "MPL 1.1" license. For details, see [project/lib/cairo/](project/lib). diff --git a/project/Build.xml b/project/Build.xml index 0127f393d..2ac4822d4 100644 --- a/project/Build.xml +++ b/project/Build.xml @@ -9,6 +9,7 @@ + @@ -36,10 +37,10 @@ + - @@ -291,6 +292,7 @@ + @@ -320,6 +322,7 @@ + diff --git a/project/lib/axtls b/project/lib/axtls new file mode 160000 index 000000000..2e7826347 --- /dev/null +++ b/project/lib/axtls @@ -0,0 +1 @@ +Subproject commit 2e7826347adc1e4b4cf729d642c9c2474daae166 diff --git a/project/lib/curl b/project/lib/curl index 06c40092e..b97ec6d82 160000 --- a/project/lib/curl +++ b/project/lib/curl @@ -1 +1 @@ -Subproject commit 06c40092eb58c3de61ad24b9ffbc0983490fa18e +Subproject commit b97ec6d82c4b27d89b1f0cf0c103f574c9ece871