Merge branch 'features-3018' into develop_old
# Conflicts: # auxiliary/defines.h # controls/ListModel.h # controls/controls.pri
No related branches found
No related tags found
Showing
- controls/CustomComboBoxPopup.cpp 50 additions, 28 deletionscontrols/CustomComboBoxPopup.cpp
- controls/CustomComboBoxPopup.h 23 additions, 6 deletionscontrols/CustomComboBoxPopup.h
- controls/CustomPlacementButton_New.cpp 35 additions, 43 deletionscontrols/CustomPlacementButton_New.cpp
- controls/CustomPlacementButton_New.h 28 additions, 10 deletionscontrols/CustomPlacementButton_New.h
- controls/CustomWidget.cpp 0 additions, 110 deletionscontrols/CustomWidget.cpp
- controls/CustomWidget.h 0 additions, 46 deletionscontrols/CustomWidget.h
- controls/ListModel.cpp 0 additions, 54 deletionscontrols/ListModel.cpp
- controls/ListModel.h 0 additions, 38 deletionscontrols/ListModel.h
Loading
Please register or sign in to comment