diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-14 00:31:37 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-14 00:31:37 (GMT) |
| commit | 2ec89699a6f372ccbd92ce2bda753ec0e28f8650 (patch) | |
| tree | e8f5a9c9bb8cb41a7e47e7b75cd3f6ddac702814 /tools/linguist/lupdate/lupdate.1 | |
| parent | 351060bd313220044b9323d59d56627e78deea9f (diff) | |
| parent | 48592026bc9eb024f304411895c3f233b2296cfa (diff) | |
| download | Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.zip Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.gz Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp
Diffstat (limited to 'tools/linguist/lupdate/lupdate.1')
| -rw-r--r-- | tools/linguist/lupdate/lupdate.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1 index a4d2301..2978c99 100644 --- a/tools/linguist/lupdate/lupdate.1 +++ b/tools/linguist/lupdate/lupdate.1 @@ -1,6 +1,6 @@ .TH lupdate 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*- .\" -.\" Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +.\" Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). .\" All rights reserved. .\" Contact: Nokia Corporation (qt-info@nokia.com) .\" |