diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
| commit | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (patch) | |
| tree | 70df9d393d3b6946178378560834239c81fdabf0 /.commit-template | |
| parent | 86b4c125372f02c21be81fff376817852c28afa9 (diff) | |
| parent | 2e16dff13d260e8ba07534b36ac635c9e625e442 (diff) | |
| download | Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.zip Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.gz Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
Diffstat (limited to '.commit-template')
0 files changed, 0 insertions, 0 deletions