diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:12:44 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:12:44 (GMT) |
| commit | e53480370409b96d24d3f53513e8b2019a398e70 (patch) | |
| tree | 666584367727ab15aa65b37e0b795b74f5467dba /doc/src/snippets/code/src_script_qscriptengineagent.cpp | |
| parent | dead11df75ef6957a56ad83de6020a6c4e87ba16 (diff) | |
| download | Qt-e53480370409b96d24d3f53513e8b2019a398e70.zip Qt-e53480370409b96d24d3f53513e8b2019a398e70.tar.gz Qt-e53480370409b96d24d3f53513e8b2019a398e70.tar.bz2 | |
Finish to resolve merge conflict.
Move the change that were made in commit 9957e85e37345e946ecc67196d65fbca867a2001
from src/multimedia/qml/qml.pri to src/multimedia/effects/effects.pri
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengineagent.cpp')
0 files changed, 0 insertions, 0 deletions