summaryrefslogtreecommitdiffstats
path: root/translations
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2010-01-21 15:27:01 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2010-01-21 15:27:01 (GMT)
commit7d6180f906ee50c10b27db722f55974f0f3a0ef4 (patch)
tree9a9c1a5e000a76afdada46cf411fd4a13bd12bcc /translations
parent9bbaea4318dd41c9e2fd27fbc1eeec931e372d4f (diff)
downloadQt-7d6180f906ee50c10b27db722f55974f0f3a0ef4.zip
Qt-7d6180f906ee50c10b27db722f55974f0f3a0ef4.tar.gz
Qt-7d6180f906ee50c10b27db722f55974f0f3a0ef4.tar.bz2
Merge from upstream
The patch accepted upstream has the signal and slot renamed, so there is a corresponding change to main.cpp commit 53c672fb9853fef5a00285213084f02a4253e5f3 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 21 15:45:40 2010 +0100 trk: Handle TrkNotifyStopped in launcher. Add signal and static utility functions to parse message. Reviewed-by: Robert Loehning <robert.loehning@nokia.com> Initial-patch-by: Shane Kearns <shane.kearns@sosco.com> Task-number: QTBUG-7444
Diffstat (limited to 'translations')
0 files changed, 0 insertions, 0 deletions