Feature 2624 (!4) · Merge requests · cellframe / libdap-qt-ui-qml · GitLab

Snippets Groups Projects

Merged konstantin.kukharenko requested to merge feature-2624 into master 5 years ago

Dec 13, 2019
- [-]remove property and comment · af9704c2
  Konstantin authored 5 years ago
  
  af9704c2
- [+]add comment · 2f1f4921
  Konstantin authored 5 years ago
  
  2f1f4921
- Merge branch 'feature-2624' of... · 27e19602
  Konstantin authored 5 years ago
```
Merge branch 'feature-2624' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui-qml into feature-2624
```
  27e19602
- [*]item delegat contentItem [+] property padding · 213ec37e
  Konstantin authored 5 years ago
  
  213ec37e
- Merge branch 'master' into 'feature-2624' · 7b4ce5d5
  konstantin.kukharenko authored 5 years ago
```
# Conflicts:
#   DapComboBox.qml
```
  7b4ce5d5
- Aligned text in list · ace0f84c
  Konstantin authored 5 years ago
  
  ace0f84c
- qw · 832b30e3
  Konstantin authored 5 years ago
  
  832b30e3