Merge remote-tracking branch 'origin/features-3223' into develop_old (7800a054) · 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.

7800a054

Commit 7800a054 authored 5 years ago by alexandr.mruchok

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/features-3223' into develop_old

# Conflicts:
#	controls/controls.pri

parents eb16f949 c745d197

No related branches found

No related tags found

2 merge requests!17Develop old,!15[-]delete button _New

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

controls/CustomComboBoxPopup.cpp 2 additions, 2 deletions

controls/CustomComboBoxPopup.cpp
controls/CustomComboBoxPopup.h 2 additions, 2 deletions

controls/CustomComboBoxPopup.h
controls/CustomPlacementButton.cpp 77 additions, 65 deletions

controls/CustomPlacementButton.cpp
controls/CustomPlacementButton.h 41 additions, 21 deletions

controls/CustomPlacementButton.h
controls/CustomPlacementButton_New.cpp 0 additions, 177 deletions

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

controls/CustomPlacementButton_New.h
controls/StyledSubcontrol.cpp 0 additions, 91 deletions

controls/StyledSubcontrol.cpp
controls/StyledSubcontrol.h 0 additions, 40 deletions

controls/StyledSubcontrol.h
controls/controls.pri 0 additions, 2 deletions

controls/controls.pri

with 122 additions and 501 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