diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 11:54:04 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 11:54:04 (GMT) |
| commit | 9f51c31a0f492c20e6d882b2ae1e036b29c2755c (patch) | |
| tree | cbb3beed71735514632b4f2788b63e72667cfc04 /doc/src/snippets/textdocument-imagedrop/main.cpp | |
| parent | 0e10b8dbb7d84694cbdeb57bf42df52b12d79f47 (diff) | |
| parent | 4f933036a0ecbc6e6174b312ec2fd6078cea5b70 (diff) | |
| download | Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.zip Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.tar.gz Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.tar.bz2 | |
Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7
Conflicts:
src/network/ssl/qsslcertificate.cpp
Diffstat (limited to 'doc/src/snippets/textdocument-imagedrop/main.cpp')
| -rw-r--r-- | doc/src/snippets/textdocument-imagedrop/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/textdocument-imagedrop/main.cpp b/doc/src/snippets/textdocument-imagedrop/main.cpp index 24cd2de..0cdf3a1 100644 --- a/doc/src/snippets/textdocument-imagedrop/main.cpp +++ b/doc/src/snippets/textdocument-imagedrop/main.cpp @@ -49,4 +49,4 @@ int main(int argc, char * argv[]) textEdit->show(); return app.exec(); -}
\ No newline at end of file +} |