Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

2146446f

Commit 2146446f authored 4 years ago by Renne Thomas

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into renne

parents 966eee8f 3c4df3b7

No related branches found

No related tags found

1 merge request!25Correct Issue https://forgemia.inra.fr/pappso/xtpcpp/-/issues/28

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 4 additions, 2 deletions

CMakeLists.txt
CMakeStuff/toolchains/mxe-toolchain-olivier.cmake 12 additions, 10 deletions

CMakeStuff/toolchains/mxe-toolchain-olivier.cmake
debian/changelog 6 additions, 0 deletions

debian/changelog
src/grouping/groupinggroup.cpp 1 addition, 1 deletion

src/grouping/groupinggroup.cpp
src/output/ods/comparspecificspectrasheet.h 1 addition, 3 deletions

src/output/ods/comparspecificspectrasheet.h
src/output/ods/comparspectrasheet.h 1 addition, 5 deletions

src/output/ods/comparspectrasheet.h
win64/innosetup.bash 1 addition, 1 deletion

win64/innosetup.bash
win64/xtpcpp-mxe.iss.cmake 74 additions, 72 deletions

win64/xtpcpp-mxe.iss.cmake

with 100 additions and 94 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