Merge branch 'develop' into feature-3127 (68028536) · Commits · cellframe / libdap-qt-ui · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

libdap-qt-ui
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

68028536

Commit 68028536 authored 5 years ago by alexandr.mruchok

Downloads
- Plain Diff

Merge branch 'develop' into feature-3127

# Conflicts:
#	auxiliary/defines.h

parents 0928225d 378fa1c1

No related branches found

No related tags found

1 merge request!17Develop old

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

auxiliary/defines.h 4 additions, 2 deletions

auxiliary/defines.h
controls/CustomComboBoxPopup.cpp 1 addition, 1 deletion

controls/CustomComboBoxPopup.cpp
controls/CustomLineHeightTextEdit.cpp 81 additions, 0 deletions

controls/CustomLineHeightTextEdit.cpp
controls/CustomLineHeightTextEdit.h 77 additions, 0 deletions

controls/CustomLineHeightTextEdit.h
controls/CustomPlacementButton_New.cpp 176 additions, 0 deletions

controls/CustomPlacementButton_New.cpp
controls/CustomPlacementButton_New.h 79 additions, 0 deletions

controls/CustomPlacementButton_New.h
controls/CustomWidget.cpp 14 additions, 4 deletions

controls/CustomWidget.cpp
controls/CustomWidget.h 13 additions, 2 deletions

controls/CustomWidget.h
controls/controls.pri 4 additions, 0 deletions

controls/controls.pri

with 449 additions and 9 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