diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-18 14:51:35 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-18 14:51:35 (GMT) |
| commit | 396eeb3f71c1c7edd861da1c8a8ec3086348502e (patch) | |
| tree | 3ff6670ef4b192fd0993e0e9629e616570a6475a /tools/porting | |
| parent | e356eed2fa3d8e62085d6bd72caba9d11c40bacf (diff) | |
| parent | 31ed96ef2c34429d61a5d9d1c1b7fe4fc17c708b (diff) | |
| download | Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.zip Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.gz Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
Diffstat (limited to 'tools/porting')
| -rw-r--r-- | tools/porting/src/qt3headers0.resource | bin | 547809 -> 548362 bytes |
| -rw-r--r-- | tools/porting/src/qt3headers1.resource | bin | 512251 -> 512882 bytes |
| -rw-r--r-- | tools/porting/src/qt3headers2.resource | bin | 392439 -> 393093 bytes |
| -rw-r--r-- | tools/porting/src/qt3headers3.resource | bin | 553089 -> 553753 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/tools/porting/src/qt3headers0.resource b/tools/porting/src/qt3headers0.resource Binary files differindex 13be468..8e24385 100644 --- a/tools/porting/src/qt3headers0.resource +++ b/tools/porting/src/qt3headers0.resource diff --git a/tools/porting/src/qt3headers1.resource b/tools/porting/src/qt3headers1.resource Binary files differindex e06d270..8da4b9a 100644 --- a/tools/porting/src/qt3headers1.resource +++ b/tools/porting/src/qt3headers1.resource diff --git a/tools/porting/src/qt3headers2.resource b/tools/porting/src/qt3headers2.resource Binary files differindex e44c81d..62bdb8e 100644 --- a/tools/porting/src/qt3headers2.resource +++ b/tools/porting/src/qt3headers2.resource diff --git a/tools/porting/src/qt3headers3.resource b/tools/porting/src/qt3headers3.resource Binary files differindex 6d259f2..6a096e8 100644 --- a/tools/porting/src/qt3headers3.resource +++ b/tools/porting/src/qt3headers3.resource |