From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Wed, 27 May 2015 14:18:27 +0000 (+0200)
Subject: Merge branch 'creaButtonContainer'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b61b15415d19c665de225637c9136c634a5831c5;hp=b61b15415d19c665de225637c9136c634a5831c5;p=creaMaracasVisu.git

Merge branch 'creaButtonContainer'

Conflicts:
	bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
---