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)
commit39bff056a617b51b8e3c4fb175f3e6963d3946fe
tree2f73bf14f1fcb42ec41a4c6488873cf9a3a17009
parent128d46e19a4246364af4d361e3c570982a43fb7d
parent14c55083f31175d21a91fc80b1fec21fb55a2119
Merge remote-tracking branch 'origin/2.0'
src/gui/application.cpp