]> Creatis software - clitk.git/commit
Merge branch 'master' into wipe
authortbaudier <thomas.baudier@creatis.insa-lyon.fr>
Tue, 17 Jan 2017 14:15:25 +0000 (15:15 +0100)
committertbaudier <thomas.baudier@creatis.insa-lyon.fr>
Tue, 17 Jan 2017 14:15:25 +0000 (15:15 +0100)
commit00f0cf9c85ed7ed21404d851c07cf02e4ccfa5ab
treea593ca9055c729a6bd8f1a7d3958b0238b0f981f
parent5a7107ac4a5381de625e129b40c87f832a078c9f
parent4815f905d913f3272ea1ac4ebd42656edb22966a
Merge branch 'master' into wipe

Conflicts:
vv/qt_ui/vvMainWindow.ui
vv/vvIcons.qrc
vv/CMakeLists.txt
vv/qt_ui/vvMainWindow.ui
vv/vvIcons.qrc
vv/vvMainWindow.cxx
vv/vvMainWindow.h