diff options
author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-10-06 14:46:43 (GMT) |
---|---|---|
committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-10-06 14:46:43 (GMT) |
commit | 311170a69e61fdd0fa4c302ec9ceb33df2c49a5d (patch) | |
tree | f9956571262a626076a3988ec78666da8ed440bd /tests/auto/qbuffer | |
parent | 255c512d7f536573963f371cdd73be0c4bd169b9 (diff) | |
download | Qt-311170a69e61fdd0fa4c302ec9ceb33df2c49a5d.zip Qt-311170a69e61fdd0fa4c302ec9ceb33df2c49a5d.tar.gz Qt-311170a69e61fdd0fa4c302ec9ceb33df2c49a5d.tar.bz2 |
Fix a pending issue with the merge request 2286
A merge conflict was forgoten in the last update. This patch fixes that.
Diffstat (limited to 'tests/auto/qbuffer')
0 files changed, 0 insertions, 0 deletions