diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 01:06:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 01:06:53 (GMT) |
| commit | b9907e309885b4b8ce280c721231a56a583b51d0 (patch) | |
| tree | c00dc724328822994a9bc9ec4197c0d6323b2dd3 /src/network | |
| parent | c0179a6f640a3a88550656884d0bb5065e6b048a (diff) | |
| parent | 84ef315a9ff6014056d7b6313cf9b1f8bdf06cdc (diff) | |
| download | Qt-b9907e309885b4b8ce280c721231a56a583b51d0.zip Qt-b9907e309885b4b8ce280c721231a56a583b51d0.tar.gz Qt-b9907e309885b4b8ce280c721231a56a583b51d0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
Export a function to get dfb-surface from a pixmap
Diffstat (limited to 'src/network')
0 files changed, 0 insertions, 0 deletions