diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-22 11:27:57 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-22 11:27:57 (GMT) |
| commit | cf1f76661613313615a77479687fa93a3c97efc9 (patch) | |
| tree | 978b8d1117224773952d1d2782d7825920bfc6ed /src/corelib/tools/qlocale.cpp | |
| parent | d8908922f339892fee4275a433e2bf6da87ae055 (diff) | |
| parent | be227b0a01bb28f3ebebedc1aaa65cd8098edd81 (diff) | |
| download | Qt-cf1f76661613313615a77479687fa93a3c97efc9.zip Qt-cf1f76661613313615a77479687fa93a3c97efc9.tar.gz Qt-cf1f76661613313615a77479687fa93a3c97efc9.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index a51ee81..6b1de5e 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -2096,6 +2096,7 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l) \value Serbia \value SaintBarthelemy \value SaintMartin + \value LatinAmericaAndTheCaribbean \omitvalue LastCountry \sa country() |