diff options
| author | mread <qt-info@nokia.com> | 2010-07-02 08:36:58 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-07-02 08:36:58 (GMT) |
| commit | 36f4d17a139c58cf00d3d9222dd2d35603ac09e8 (patch) | |
| tree | 34a038fc245e0130ff353d5b24f6eaa527671860 /src/gui/image | |
| parent | b61a5e36daf73c467638220ecd495ff95dcf6fe0 (diff) | |
| download | Qt-36f4d17a139c58cf00d3d9222dd2d35603ac09e8.zip Qt-36f4d17a139c58cf00d3d9222dd2d35603ac09e8.tar.gz Qt-36f4d17a139c58cf00d3d9222dd2d35603ac09e8.tar.bz2 | |
qtguiu.def merge conflict fix
This takes the new exports added in qt/4.7, leaves them in place and
moves the Avkon Removal exports, which conflicted, to the end of the
DEF file.
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/image')
0 files changed, 0 insertions, 0 deletions