Merge branch 'renne' into 'master'
Multiples Corrections and features implementations See merge request !33
Showing
- src/CMakeLists.txt 1 addition, 0 deletionssrc/CMakeLists.txt
- src/core/tandem_run/tandembatchprocess.cpp 18 additions, 3 deletionssrc/core/tandem_run/tandembatchprocess.cpp
- src/grouping/ptm/ptmgroupingexperiment.cpp 1 addition, 1 deletionsrc/grouping/ptm/ptmgroupingexperiment.cpp
- src/grouping/ptm/ptmgroupingexperiment.h 1 addition, 1 deletionsrc/grouping/ptm/ptmgroupingexperiment.h
- src/grouping/ptm/ptmisland.cpp 13 additions, 3 deletionssrc/grouping/ptm/ptmisland.cpp
- src/grouping/ptm/ptmisland.h 6 additions, 3 deletionssrc/grouping/ptm/ptmisland.h
- src/gui/edit/edit_settings/edit_settings.ui 32 additions, 2 deletionssrc/gui/edit/edit_settings/edit_settings.ui
- src/gui/edit/edit_settings/editsettings.cpp 22 additions, 0 deletionssrc/gui/edit/edit_settings/editsettings.cpp
- src/gui/export/export_masschroq_dialog/export_masschroq_dialog.ui 20 additions, 3 deletions...export/export_masschroq_dialog/export_masschroq_dialog.ui
- src/gui/export/export_masschroq_dialog/exportmasschroqdialog.cpp 46 additions, 31 deletions.../export/export_masschroq_dialog/exportmasschroqdialog.cpp
- src/gui/export/export_masschroq_dialog/exportmasschroqdialog.h 7 additions, 7 deletions...ui/export/export_masschroq_dialog/exportmasschroqdialog.h
- src/gui/export/export_masschroq_dialog/masschroqfileparameters.h 0 additions, 1 deletion.../export/export_masschroq_dialog/masschroqfileparameters.h
- src/gui/project_view/projectwindow.cpp 16 additions, 1 deletionsrc/gui/project_view/projectwindow.cpp
- src/gui/project_view/projectwindow.h 5 additions, 0 deletionssrc/gui/project_view/projectwindow.h
- src/gui/ptm_island_list_view/ptm_island_list_view.ui 44 additions, 1 deletionsrc/gui/ptm_island_list_view/ptm_island_list_view.ui
- src/gui/ptm_island_list_view/ptmislandlistwindow.cpp 81 additions, 3 deletionssrc/gui/ptm_island_list_view/ptmislandlistwindow.cpp
- src/gui/ptm_island_list_view/ptmislandlistwindow.h 28 additions, 6 deletionssrc/gui/ptm_island_list_view/ptmislandlistwindow.h
- src/gui/ptm_island_list_view/ptmislandproxymodel.cpp 77 additions, 7 deletionssrc/gui/ptm_island_list_view/ptmislandproxymodel.cpp
- src/gui/ptm_island_list_view/ptmislandproxymodel.h 9 additions, 5 deletionssrc/gui/ptm_island_list_view/ptmislandproxymodel.h
- src/gui/ptm_island_list_view/ptmislandtablemodel.cpp 38 additions, 3 deletionssrc/gui/ptm_island_list_view/ptmislandtablemodel.cpp
Loading
Please register or sign in to comment