diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-03-17 12:26:06 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2010-03-17 12:26:06 (GMT) |
| commit | 5f23bb62e1e4862c89bccebb93d128685cdb8e7a (patch) | |
| tree | 330cfde0d2cf21c4e124b0df94c2d48b747e6867 /doc/src/snippets/code/src_script_qscriptengineagent.cpp | |
| parent | 93eed083e48ab44c7bbe65083701ce2890040f7c (diff) | |
| parent | ed08d67fea713e550da0fd0542672cc4443806e2 (diff) | |
| download | Qt-5f23bb62e1e4862c89bccebb93d128685cdb8e7a.zip Qt-5f23bb62e1e4862c89bccebb93d128685cdb8e7a.tar.gz Qt-5f23bb62e1e4862c89bccebb93d128685cdb8e7a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
I submitted the same updated configure.exe to both qt.git and qt-multimedia-staging.git.
Furthermore, there were other updates to configure.exe in qt.git. Seems git
cannot resolve this on it's own.
Conflicts:
configure.exe
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengineagent.cpp')
0 files changed, 0 insertions, 0 deletions