diff options
| author | axis <qt-info@nokia.com> | 2010-06-24 13:14:21 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-06-24 13:14:21 +0200 |
| commit | 447f2b410335730cd172a76abce184bacae186d2 (patch) | |
| tree | 73d93ef871e99f03eedd69eeb0fa74228c1e33d3 /.gitignore | |
| parent | 5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1 (diff) | |
| parent | 7ae5285132db6c435e91ab097f41097217d68a2c (diff) | |
| download | qt4-tools-447f2b410335730cd172a76abce184bacae186d2.tar.gz | |
Merge branch '4.6-s60' into 4.7-s60
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions