diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-05 07:04:35 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-05 07:04:35 (GMT) |
commit | 70ffa3d571c5085d2702cdd0b43f85ddb2c0b8eb (patch) | |
tree | 67a0a904ef63a6f5e60881859c891ed71ca0644c /mkspecs/netbsd-g++/qplatformdefs.h | |
parent | 8b40fac7e97a629ddaf1c0f6de2ebb504f004060 (diff) | |
parent | 26cae0653332caf0b4e315fd35fd59469c66bac9 (diff) | |
download | Qt-70ffa3d571c5085d2702cdd0b43f85ddb2c0b8eb.zip Qt-70ffa3d571c5085d2702cdd0b43f85ddb2c0b8eb.tar.gz Qt-70ffa3d571c5085d2702cdd0b43f85ddb2c0b8eb.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
tests/auto/declarative/valuetypes/testtypes.cpp
Diffstat (limited to 'mkspecs/netbsd-g++/qplatformdefs.h')
0 files changed, 0 insertions, 0 deletions