diff options
author | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
---|---|---|
committer | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
commit | 160b82950ec53d3a0392df0fd18ac6856bfecbcf (patch) | |
tree | 1bdae6efe3fbcb7f25e0ce91884f83e1cdf68189 /src/winmain | |
parent | 8ba781b01e900148fec2e9d26485369b3295487f (diff) | |
parent | 085bd7cf2d76f9acd548120f859201b014970a72 (diff) | |
download | Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.zip Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.gz Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.bz2 |
Merge branch '4.8' into earth-staging-master
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'src/winmain')
0 files changed, 0 insertions, 0 deletions