diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-07 14:12:39 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-07 14:12:39 (GMT) |
| commit | 91efdcaed6fe9e931b049460d9a177a4c4e5ac3e (patch) | |
| tree | c48f82df7c4623507f2cc29c5ed9006ffe5ad33c /examples | |
| parent | 5f8ef6ac44e1db842003deeed6525eea70d8d83d (diff) | |
| download | Qt-91efdcaed6fe9e931b049460d9a177a4c4e5ac3e.zip Qt-91efdcaed6fe9e931b049460d9a177a4c4e5ac3e.tar.gz Qt-91efdcaed6fe9e931b049460d9a177a4c4e5ac3e.tar.bz2 | |
Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.
The file had been renamed so git did not merge it properly
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions