diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-08-06 13:09:02 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-08-06 13:09:02 (GMT) |
| commit | 8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143 (patch) | |
| tree | 4f19a338ad94e70992a95166544afacac45ef2e1 /mkspecs/win32-g++ | |
| parent | d8ecf6b6f6b6c0f532a4c9f25bcd36e808dc0d2a (diff) | |
| parent | b738719a192c49f9bab64cebfa2bad67b9630870 (diff) | |
| download | Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.zip Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.gz Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Conflicts:
src/dbus/qdbusmacros.h
Diffstat (limited to 'mkspecs/win32-g++')
0 files changed, 0 insertions, 0 deletions