Merge branch 'dev' into feature/custom_drawer_component

This commit is contained in:
ronoaer 2023-10-21 09:28:41 +08:00 committed by GitHub
commit 023c3474d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
96 changed files with 3897 additions and 1733 deletions

View file

@ -217,5 +217,11 @@
<file>ui/qml/Controls2/TopCloseButtonType.qml</file>
<file>images/controls/x-circle.svg</file>
<file>ui/qml/Controls2/Drawer2Type.qml</file>
<file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
<file>server_scripts/awg/template.conf</file>
<file>server_scripts/awg/start.sh</file>
<file>server_scripts/awg/configure_container.sh</file>
<file>server_scripts/awg/run_container.sh</file>
<file>server_scripts/awg/Dockerfile</file>
</qresource>
</RCC>