projects / bbtk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de36a36 45fbe1e)
Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk
authorcervenansky <frederic.cervenansky@creatis.insa-lyon.fr>
Wed, 23 Jan 2013 11:29:15 +0000 (12:29 +0100)
committercervenansky <frederic.cervenansky@creatis.insa-lyon.fr>
Wed, 23 Jan 2013 11:29:15 +0000 (12:29 +0100)
Conflicts:
kernel/cmake/BBTKConfigurePackage.cmake


Trivial merge
Black Box Tool Kit