search

feelpp / angiotk

Virtual Angiography Toolkit
http://docs.feelpp.org/angiotk/0.1
Apache License 2.0
5 stars 0 forks source link

Feature/matrix #16

Closed prudhomm closed 6 years ago

prudhomm commented 7 years ago

@francoisdh there are conflicts to fix with master branch

francoisdh commented 7 years ago

@prudhomm How/where can see the list of conflicts ? I just merged the master branch in the feature/matrix one and only needed to fix CMakeLists.txt.

prudhomm commented 7 years ago

@vincentchabannes we should merge at some point this work

prudhomm commented 7 years ago

could you review and decide whether to merge or ask for changes ?