Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Oct 2011 05:53:25 +0000 (15:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Oct 2011 05:53:25 +0000 (15:53 +1000)
commitaf9d77acbf1dc80308df00526163d905e9b22421
tree3ae8be23b73500d6652fa26e365a7817e5909b6a
parent7f3cd2949ccb16b1b611c05bf6ab7274cf04a0f8
parent6086364d30ea2a4bef4d4f8f2c1bfb8f113ae233
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate