merge conflict (51f940d6) · Commits · PAPPSO / xtpcpp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

xtpcpp
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

Admin message

A compter du 1er avril, attention à vos pipelines : Nouvelles limitations de Docker Hub

Admin message

Opération de maintenance mensuelle - Mise à jour de Gitlab - Mardi 15 Avril entre 7h00 et 8h30

51f940d6

Commit 51f940d6 authored 7 years ago by Langella Olivier

Downloads
- Plain Diff

merge conflict

parents 9cab7ca7 d86abcd8

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/core/tandem_run/tandemcondorprocess.cpp 5 additions, 0 deletions

src/core/tandem_run/tandemcondorprocess.cpp
src/gui/project_view/projectwindow.cpp 3 additions, 2 deletions

src/gui/project_view/projectwindow.cpp
src/input/xtandemsaxhandler.cpp 29 additions, 4 deletions

src/input/xtandemsaxhandler.cpp

with 37 additions and 6 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