summaryrefslogtreecommitdiffstats
path: root/tools/shared
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-19 14:00:55 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-19 14:00:55 (GMT)
commit6f44020cf97bd74e02ee011e6cb182aa93109b21 (patch)
treeade40b7824127a2213007419dddd68fd89300ae1 /tools/shared
parent42567d2e4d85e001f77767cabea8acb06daeb94d (diff)
downloadQt-6f44020cf97bd74e02ee011e6cb182aa93109b21.zip
Qt-6f44020cf97bd74e02ee011e6cb182aa93109b21.tar.gz
Qt-6f44020cf97bd74e02ee011e6cb182aa93109b21.tar.bz2
Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
Reviewed-by: Denis Dzyubenko
Diffstat (limited to 'tools/shared')
0 files changed, 0 insertions, 0 deletions