Merge remote-tracking branch 'mainline/4.8'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 1 Jun 2011 10:38:39 +0000 (12:38 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 1 Jun 2011 10:38:39 +0000 (12:38 +0200)
commitc7c39a79f2d31c7f6a745e5169d4cb145662f652
tree418dd4bfde6b2d8ce47d9397c49fcfeabba69cae
parent0b92d6cc61a18ae18d254ac6ee463e74cb570db4
parent3cbf4e94d5c02eb97bd56fc65bf354024edc3413
Merge remote-tracking branch 'mainline/4.8'
tools/linguist/lrelease/main.cpp