Merge remote-tracking branch 'origin/2.0'
authorOlivier Goffart <ogoffart@woboq.com>
Sat, 5 Sep 2015 16:14:30 +0000 (18:14 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Sat, 5 Sep 2015 16:14:30 +0000 (18:14 +0200)
1  2 
src/gui/application.cpp

Simple merge