Merge remote-tracking branch 'origin/2.0'
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 7 Sep 2015 08:32:16 +0000 (10:32 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Mon, 7 Sep 2015 08:32:16 +0000 (10:32 +0200)
commit21dbf97a026e8ee1997d5928642a36bb465c15ca
treeea7e4bddbdc2fc049bd968f62490df980dedaa13
parent39bff056a617b51b8e3c4fb175f3e6963d3946fe
parent66f340734cff57bd13c993f33e8e75fee73b00b1
Merge remote-tracking branch 'origin/2.0'
src/gui/application.cpp