diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
| commit | 7421702dd3202c21f3871171792476f0d2d50abe (patch) | |
| tree | 5a45e20fd74e23cf0a4ad2aa1a80bd073fa51413 /mkspecs | |
| parent | 9094a6588de3a7264ec4647a24b94253a7609823 (diff) | |
| parent | 949e21cdafeec0c0e4ac632ebbf21767479f04e5 (diff) | |
| download | Qt-7421702dd3202c21f3871171792476f0d2d50abe.zip Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.gz Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions