diff options
| author | axis <qt-info@nokia.com> | 2010-03-01 14:39:10 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-01 14:39:29 (GMT) |
| commit | b45eeb23718ce0b01391c74039587b22c996854b (patch) | |
| tree | 5ae337d1597f6131288d2b2d0471933587b9a5ee /header.BSD | |
| parent | 88a36e9e7e0e0bc09788c41ab6b968031dbc9154 (diff) | |
| download | Qt-b45eeb23718ce0b01391c74039587b22c996854b.zip Qt-b45eeb23718ce0b01391c74039587b22c996854b.tar.gz Qt-b45eeb23718ce0b01391c74039587b22c996854b.tar.bz2 | |
Corrected a mismerge by Git.
Diffstat (limited to 'header.BSD')
0 files changed, 0 insertions, 0 deletions