Merge branch 'master' into bugs-4298 (d3ba202c) · Commits · dap / dap-ui-sdk · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dap-ui-sdk
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d3ba202c

Commit d3ba202c authored 4 years ago by Danil Martynenko

Downloads
- Plain Diff

Merge branch 'master' into bugs-4298

parents eab3af36 725139af

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

qml/libdap-qt-ui-qml.qrc 0 additions, 2 deletions

qml/libdap-qt-ui-qml.qrc
qml/widgets/DapMainWindow.qml 0 additions, 6 deletions

qml/widgets/DapMainWindow.qml
qml/widgets/DapMainWindowForm.ui.qml 0 additions, 60 deletions

qml/widgets/DapMainWindowForm.ui.qml
ui/controls/SerialKeyField.cpp 60 additions, 36 deletions

ui/controls/SerialKeyField.cpp
vpn/ui/controls/ComboBoxListView.cpp 6 additions, 1 deletion

vpn/ui/controls/ComboBoxListView.cpp
vpn/ui/dialogs/BugReportScreen.ui 58 additions, 19 deletions

vpn/ui/dialogs/BugReportScreen.ui
vpn/ui/dialogs/SignInScreenSerialNumberBase.cpp 3 additions, 1 deletion

vpn/ui/dialogs/SignInScreenSerialNumberBase.cpp

with 127 additions and 125 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment