diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-16 01:19:01 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-16 01:19:01 (GMT) |
| commit | a720cb9fc573edd77a559be31bb2dcc090faf1aa (patch) | |
| tree | aad8e2760b2c5c5bbb55ebb6f91f68196570049b /tests/auto/qfileinfo/qfileinfo.qrc | |
| parent | ceed269b0c46e7ff2e55638822b978692c89ae9a (diff) | |
| parent | 946eab3e327bddcce10ed838462c0ca56ff011f0 (diff) | |
| download | Qt-a720cb9fc573edd77a559be31bb2dcc090faf1aa.zip Qt-a720cb9fc573edd77a559be31bb2dcc090faf1aa.tar.gz Qt-a720cb9fc573edd77a559be31bb2dcc090faf1aa.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/declarative.pro
Diffstat (limited to 'tests/auto/qfileinfo/qfileinfo.qrc')
0 files changed, 0 insertions, 0 deletions