diff options
| author | axis <qt-info@nokia.com> | 2010-11-23 08:54:18 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-11-23 08:55:57 (GMT) |
| commit | 5b4362cb2d4dd7a5610a5be0a21b3071e26ea519 (patch) | |
| tree | 97463065a200e32bb80b19781fddc088cb81d025 /doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp | |
| parent | 879c325b3ea8108790f46f3bb58e91ebc12fa550 (diff) | |
| parent | 1ba013feae994a40abe3835185cae211b136a0e8 (diff) | |
| download | Qt-5b4362cb2d4dd7a5610a5be0a21b3071e26ea519.zip Qt-5b4362cb2d4dd7a5610a5be0a21b3071e26ea519.tar.gz Qt-5b4362cb2d4dd7a5610a5be0a21b3071e26ea519.tar.bz2 | |
Merge branch '4.7-s60' into 4.7-s60
Corrected a mismerge by choosing ours.
Diffstat (limited to 'doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp')
0 files changed, 0 insertions, 0 deletions