Merge branch '4.8' into water-team-master
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Wed, 31 Aug 2011 09:24:58 +0000 (11:24 +0200)
committerFrederik Gladhorn <frederik.gladhorn@nokia.com>
Wed, 31 Aug 2011 09:24:58 +0000 (11:24 +0200)
commit9689751ddabd402abd89803c995c14dfd600b263
tree50c6cfb527f3959bbfd15f70a78d1b6a09963068
parentcf55c058c48404cee16da6479313033be27f1a1e
parent31ff55bbeb84f10e75e997c75a63deda83e62507
Merge branch '4.8' into water-team-master
src/gui/widgets/qmenu_symbian.cpp