diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-02 18:58:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-02 18:58:39 (GMT) |
| commit | 6eb846ba57445be894e27141cd5f928584836b00 (patch) | |
| tree | b0f8d3ffc08529c7632c6dfb23ab4806c9b880fe /dist/changes-4.4.0 | |
| parent | ba805d5e1a03824c75c4d17131063be1b0fd68a1 (diff) | |
| parent | 517e50706b154254bb2b51f19b8678c6a8df2590 (diff) | |
| download | Qt-6eb846ba57445be894e27141cd5f928584836b00.zip Qt-6eb846ba57445be894e27141cd5f928584836b00.tar.gz Qt-6eb846ba57445be894e27141cd5f928584836b00.tar.bz2 | |
Merge branch '4.5' into 4.6-staging
Conflicts:
doc/src/getting-started/known-issues.qdoc
src/script/qscriptextqobject.cpp
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
Diffstat (limited to 'dist/changes-4.4.0')
0 files changed, 0 insertions, 0 deletions