diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-04-12 12:18:29 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-04-12 12:18:29 (GMT) |
| commit | 04d1cbce75e77392077ce4ae014fe8774c32a8fc (patch) | |
| tree | d8e52dbced2f087d75e3889d7d2c0b3c19f98570 /.hgignore | |
| parent | f62e846c7ebe243a2a36e7577d070f1275f2ec47 (diff) | |
| parent | d01f82879dd4d40ece8afb54d6d25f1ef9e35624 (diff) | |
| download | Qt-04d1cbce75e77392077ce4ae014fe8774c32a8fc.zip Qt-04d1cbce75e77392077ce4ae014fe8774c32a8fc.tar.gz Qt-04d1cbce75e77392077ce4ae014fe8774c32a8fc.tar.bz2 | |
Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network
Conflicts:
configure.exe
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions