diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 13:02:36 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 13:02:36 (GMT) |
| commit | 0533cd3a773952490eb0e5686afb7b235799a13f (patch) | |
| tree | a1f14fe42a51499666921d58a6a5b62f1f916d8e /src/3rdparty/ptmalloc | |
| parent | 9c132451acc7fbed1611fd3676cceb26e815f50d (diff) | |
| parent | e5974b024828578945bd4c349f5f87f82a635225 (diff) | |
| download | Qt-0533cd3a773952490eb0e5686afb7b235799a13f.zip Qt-0533cd3a773952490eb0e5686afb7b235799a13f.tar.gz Qt-0533cd3a773952490eb0e5686afb7b235799a13f.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
Diffstat (limited to 'src/3rdparty/ptmalloc')
0 files changed, 0 insertions, 0 deletions