diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-12-07 14:45:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-12-07 14:45:19 +0100 |
| commit | 3a4f6f7884c9ea704890cd392bb5a211d2eb5701 (patch) | |
| tree | 2be34e088894d59301c08c5f66dbbe2968ddceea /src/sql/drivers/sqlite/qsql_sqlite.cpp | |
| parent | 8a390046adddb8df3ddcf3a421f6f547e6cfe7aa (diff) | |
| parent | f485ac02b057cb076c965c3cd1bd9c78aaa5a696 (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/s60main/newallocator_hook.cpp
Diffstat (limited to 'src/sql/drivers/sqlite/qsql_sqlite.cpp')
0 files changed, 0 insertions, 0 deletions