diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 17:36:33 (GMT) |
---|---|---|
committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 17:36:33 (GMT) |
commit | 3e6d65fb2180c2a85db01d541c39f491ae63479d (patch) | |
tree | 23ac302fa75fe794ced257de440356d856050719 /.commit-template | |
parent | c9b5d8708f0c703122669938573eb575f03d6b78 (diff) | |
download | Qt-3e6d65fb2180c2a85db01d541c39f491ae63479d.zip Qt-3e6d65fb2180c2a85db01d541c39f491ae63479d.tar.gz Qt-3e6d65fb2180c2a85db01d541c39f491ae63479d.tar.bz2 |
Fixed merge conflict in Copyright date.
Diffstat (limited to '.commit-template')
0 files changed, 0 insertions, 0 deletions