Merge remote-tracking branch 'origin/1.8'
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 9 Apr 2015 12:24:26 +0000 (14:24 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 9 Apr 2015 12:24:26 +0000 (14:24 +0200)
1  2 
src/gui/sharedialog.cpp
src/gui/sharedialog.h

Simple merge
Simple merge