diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-07-01 16:06:41 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-07-01 16:06:41 +1000 |
| commit | 7377c38df90276b8e7beed0ede6446be2dfcd408 (patch) | |
| tree | 83f42d19231adf7d98fb733e29645d85f412d5e5 /doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.cpp | |
| parent | 088c5f32ffffb31c002f2cb4b1295923bb0e192b (diff) | |
| parent | d342c087d0219e7e1a7283332778785ba9825367 (diff) | |
Merge branch 'master' into revised-filters
Conflicts:
plugins/declarative/gallery/qdeclarativegalleryfilter.cpp
Diffstat (limited to 'doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.cpp')
0 files changed, 0 insertions, 0 deletions