summaryrefslogtreecommitdiffstats
path: root/doc/src/demos
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-02-07 17:36:33 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-02-07 17:36:33 (GMT)
commit3e6d65fb2180c2a85db01d541c39f491ae63479d (patch)
tree23ac302fa75fe794ced257de440356d856050719 /doc/src/demos
parentc9b5d8708f0c703122669938573eb575f03d6b78 (diff)
downloadQt-3e6d65fb2180c2a85db01d541c39f491ae63479d.zip
Qt-3e6d65fb2180c2a85db01d541c39f491ae63479d.tar.gz
Qt-3e6d65fb2180c2a85db01d541c39f491ae63479d.tar.bz2
Fixed merge conflict in Copyright date.
Diffstat (limited to 'doc/src/demos')
0 files changed, 0 insertions, 0 deletions