Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openstructure
- Activity
- Members

Snippets Groups Projects

e0dd3d48

Commit e0dd3d48 authored 5 years ago by Gerardo Tauriello

Downloads
- Plain Diff

Merge branch 'develop' into qt5_port

parents 4ef2ca3a a71fb988

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 7 additions, 1 deletion

CMakeLists.txt
cmake_support/OST.cmake 23 additions, 3 deletions

cmake_support/OST.cmake
modules/bindings/src/tmalign/basic_fun.h 3 additions, 1 deletion

modules/bindings/src/tmalign/basic_fun.h
modules/db/src/CMakeLists.txt 1 addition, 1 deletion

modules/db/src/CMakeLists.txt
modules/img/base/src/raster_image/raster_image.cc 2 additions, 1 deletion

modules/img/base/src/raster_image/raster_image.cc

with 36 additions and 7 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