diff options
author | Martin Smith <msmith@trolltech.com> | 2010-03-17 11:44:34 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-03-17 11:44:34 (GMT) |
commit | 2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1 (patch) | |
tree | 352e76fc210605d285be6d72857a6bbd7db107f9 /tests/auto/qresourceengine/.gitattributes | |
parent | d28a81d51734afd1f3a052f4c4e9fc90aef393e8 (diff) | |
parent | 7e9052cc1f16b3eeabb73ada9492d91620df796d (diff) | |
download | Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.zip Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.tar.gz Qt-2cb7aa3174bd3868f32f76a882faf59bc4d4a0b1.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/qresourceengine/.gitattributes')
0 files changed, 0 insertions, 0 deletions