diff options
author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-28 12:18:15 (GMT) |
---|---|---|
committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-28 12:18:15 (GMT) |
commit | 50576bd26cd5fb1316f0844ab6da76910d124edd (patch) | |
tree | 84b6f2103a60e08a3ea8f1ba8d985b33a710792a /mkspecs/irix-cc/qmake.conf | |
parent | 27d979b0ea39922e6e2ae3a3cc6a4d45c9c8f0e9 (diff) | |
parent | 353afc392b843519023f27753b45b2e6fd9467ff (diff) | |
download | Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.zip Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.tar.gz Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.tar.bz2 |
Merge branch '4.5'
Conflicts:
src/gui/embedded/qkbdtty_qws.cpp
Diffstat (limited to 'mkspecs/irix-cc/qmake.conf')
0 files changed, 0 insertions, 0 deletions