summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-04-17 14:38:19 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2009-04-17 14:38:19 (GMT)
commit36389c8d9e2bea2d72c9acfca60e1199c6d1818e (patch)
tree7689d92e7d0f970b7589a3bd7c43f6a3c8d96f6e /.gitignore
parent198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (diff)
downloadQt-36389c8d9e2bea2d72c9acfca60e1199c6d1818e.zip
Qt-36389c8d9e2bea2d72c9acfca60e1199c6d1818e.tar.gz
Qt-36389c8d9e2bea2d72c9acfca60e1199c6d1818e.tar.bz2
Fix compilation after a merge error
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions