Merge branch 'master' into features-2608
# Conflicts: # CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml # CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
Showing
- CellFrameDashboardGUI/DapScreenHistoryModel.cpp 2 additions, 0 deletionsCellFrameDashboardGUI/DapScreenHistoryModel.cpp
- CellFrameDashboardGUI/DapScreenHistoryModel.h 2 additions, 1 deletionCellFrameDashboardGUI/DapScreenHistoryModel.h
- CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png 0 additions, 0 deletionsCellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png
- CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark.png 0 additions, 0 deletions...rameDashboardGUI/Resources/Icons/new-wallet_icon_dark.png
- CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark_hover.png 0 additions, 0 deletions...shboardGUI/Resources/Icons/new-wallet_icon_dark_hover.png
- CellFrameDashboardGUI/main.cpp 1 addition, 1 deletionCellFrameDashboardGUI/main.cpp
- CellFrameDashboardGUI/qml.qrc 2 additions, 1 deletionCellFrameDashboardGUI/qml.qrc
- CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png 0 additions, 0 deletions...meDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png
- CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png 0 additions, 0 deletions...rameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png
- CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml 2 additions, 4 deletions...hboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
- CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml 3 additions, 3 deletions...rameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
- CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml 0 additions, 4 deletions...hboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
- CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml 1 addition, 2 deletions.../Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
- CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml 1 addition, 2 deletions...I/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
- CellFrameDashboardGUI/screen/DapUiQmlScreen.qml 1 addition, 1 deletionCellFrameDashboardGUI/screen/DapUiQmlScreen.qml
- CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml 1 addition, 1 deletionCellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
- CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml 2 additions, 4 deletions...meDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
- CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml 3 additions, 6 deletions...DashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
- CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml 134 additions, 4 deletions...oardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
- CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml 2 additions, 2 deletions...rdGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml
Loading
Please register or sign in to comment