Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:33:37 +0000 (14:33 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:33:37 +0000 (14:33 +0200)
commit21dc114334b320abe3c6f74be79d6e8e80c04ae0
tree53915add8277834e4b1377ca13b2577ed5dc8be6
parenta8658320f81430402d38090b3e6056ddfbfb13ea
parent08d0cb6f8e90a818bf6d3bec7a6d00f16419b8c0
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie422cd4d1e634ac7bbd37e98b6cdffa2e75ab58e
src/linguist/lupdate/main.cpp
src/qtconfig/mainwindow.cpp