diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-03 05:06:57 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-09 07:32:12 (GMT) |
| commit | 062b7b1280ef228567d16187951fe43e2ac0f78c (patch) | |
| tree | f0924ef8c64a69b0a8dfef2aba40037bd2c3f429 /qmake | |
| parent | 95949e7ef88eb14b7b22b06d235603f8581f6aa0 (diff) | |
| download | Qt-062b7b1280ef228567d16187951fe43e2ac0f78c.zip Qt-062b7b1280ef228567d16187951fe43e2ac0f78c.tar.gz Qt-062b7b1280ef228567d16187951fe43e2ac0f78c.tar.bz2 | |
Remove leftover code from merge conflict.
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions