Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 27 Aug 2013 20:46:13 +0000 (22:46 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 27 Aug 2013 20:46:13 +0000 (22:46 +0200)
commit3e7f3a198c26fce9d19fab38d33444d05ea29c74
treed16d5de3df640ca794e383ca332ee8a211111fcf
parent140fa19ad926f15246c8a501f8a3ccdeda4c5420
parent262744ac1b6ba95d72bedc7679e2b49c11c74803
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5db3f62185e7e99ce2c701debd00a44f40a9f5e5
src/linguist/linguist/mainwindow.cpp
src/linguist/lupdate/cpp.cpp
src/linguist/lupdate/main.cpp
src/linguist/shared/translator.cpp
tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp