diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-27 09:27:52 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-27 09:27:52 (GMT) |
| commit | 896db169ea224deb96c59ce8af800d019de63f12 (patch) | |
| tree | 8350c36941ccfd74df35fb8a6a761edcbf042452 /mkspecs/hpux-acc | |
| parent | 7a73de74fc517ff5722289cce4e4e754ff2417be (diff) | |
| parent | f8fea6f3b8fd3a1baa256130b23efc9e67a40e21 (diff) | |
| download | Qt-896db169ea224deb96c59ce8af800d019de63f12.zip Qt-896db169ea224deb96c59ce8af800d019de63f12.tar.gz Qt-896db169ea224deb96c59ce8af800d019de63f12.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/qwindowsurface_gl.cpp
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'mkspecs/hpux-acc')
0 files changed, 0 insertions, 0 deletions