diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 05:20:04 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 05:20:04 (GMT) |
| commit | 3556cc32978f59ce6e6f23f984ed1f0a5f475c4f (patch) | |
| tree | 9f8d105120af0bb4e9b9da2f66a0184c23526750 /qmake | |
| parent | 9a954d44aa20e0eb21bdf2820941bd7a1908096d (diff) | |
| parent | ebdda1575dcb815e89b2d9ee16a8dc2928f61b4c (diff) | |
| download | Qt-3556cc32978f59ce6e6f23f984ed1f0a5f475c4f.zip Qt-3556cc32978f59ce6e6f23f984ed1f0a5f475c4f.tar.gz Qt-3556cc32978f59ce6e6f23f984ed1f0a5f475c4f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxmouseregion.cpp
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions