Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

coma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9d6285f5

Commit 9d6285f5 authored 1 year ago by vladd12

Downloads
- Plain Diff

Merge branch 'master' into beta-2.11.0

# Conflicts:
#	AVM-Debug.NOTES
#	AVM-Service.NOTES
#	cmake/gen.cmake
#	src/widgets/udialog.cpp

parents 8bc03559 f49c013e

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

AVM-Debug.NOTES 16 additions, 6 deletions

AVM-Debug.NOTES
AVM-Service.NOTES 180 additions, 20 deletions

AVM-Service.NOTES
cmake/LinuxDeploy.cmake 1 addition, 1 deletion

cmake/LinuxDeploy.cmake
src/coma_core/include/coma_core/coma.h 1 addition, 1 deletion

src/coma_core/include/coma_core/coma.h
src/coma_core/src/coma.cpp 2 additions, 2 deletions

src/coma_core/src/coma.cpp
src/dialogs/configdialog.cpp 0 additions, 2 deletions

src/dialogs/configdialog.cpp
src/interfaces/include/interfaces/parsers/iec104_response_parser.h 1 addition, 1 deletion

...faces/include/interfaces/parsers/iec104_response_parser.h
src/interfaces/include/interfaces/parsers/iec104parser.h 1 addition, 1 deletion

src/interfaces/include/interfaces/parsers/iec104parser.h
src/interfaces/src/parsers/iec104parser.cpp 1 addition, 1 deletion

src/interfaces/src/parsers/iec104parser.cpp
src/journals/journaldialog.cpp 2 additions, 2 deletions

src/journals/journaldialog.cpp
src/journals/journaldialog.h 1 addition, 1 deletion

src/journals/journaldialog.h
src/tune/82/tune82verification.cpp 1 addition, 1 deletion

src/tune/82/tune82verification.cpp
src/tune/mip.cpp 1 addition, 1 deletion

src/tune/mip.cpp
src/widgets/udialog.cpp 1 addition, 0 deletions

src/widgets/udialog.cpp

with 209 additions and 40 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