Merge remote-tracking branch 'origin/master' into renne
Showing
- CMakeLists.txt 3 additions, 3 deletionsCMakeLists.txt
- debian/changelog 30 additions, 0 deletionsdebian/changelog
- src/core/alignmentgroup.cpp 2 additions, 0 deletionssrc/core/alignmentgroup.cpp
- src/core/identification_sources/identificationdatasource.cpp 3 additions, 1 deletionsrc/core/identification_sources/identificationdatasource.cpp
- src/core/msrun.cpp 45 additions, 18 deletionssrc/core/msrun.cpp
- src/core/msrun.h 4 additions, 1 deletionsrc/core/msrun.h
- src/core/project.cpp 44 additions, 9 deletionssrc/core/project.cpp
- src/core/tandem_run/tandemcondorprocess.cpp 4 additions, 1 deletionsrc/core/tandem_run/tandemcondorprocess.cpp
- src/core/tandem_run/tandemcondorprocess.h 1 addition, 0 deletionssrc/core/tandem_run/tandemcondorprocess.h
- src/gui/export/export_masschroq_dialog/exportmasschroqdialog.cpp 1 addition, 1 deletion.../export/export_masschroq_dialog/exportmasschroqdialog.cpp
- src/gui/mainwindow.cpp 8 additions, 7 deletionssrc/gui/mainwindow.cpp
- src/gui/workerthread.cpp 16 additions, 2 deletionssrc/gui/workerthread.cpp
- src/gui/workerthread.h 4 additions, 0 deletionssrc/gui/workerthread.h
- src/gui/xic_view/xicwindow.cpp 2 additions, 3 deletionssrc/gui/xic_view/xicwindow.cpp
- src/utils/httpversion.cpp 30 additions, 21 deletionssrc/utils/httpversion.cpp
- src/utils/httpversion.h 12 additions, 8 deletionssrc/utils/httpversion.h
- win64/xtpcpp-mxe.iss.cmake 1 addition, 1 deletionwin64/xtpcpp-mxe.iss.cmake
Loading
Please register or sign in to comment