diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:27:49 +0100 |
| commit | 7917dfbf1c54150d0ca3a79285767c22e6f9d770 (patch) | |
| tree | a05973334097df480afe32d07db42f381b460e74 /src/corelib/codecs | |
| parent | b9362903b339e57362a7a3296904504521d0e26f (diff) | |
| parent | b088e4827f427189334e8a1c5b4f2b8b0b713fc2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/cp949codetbl_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h index 336b0b75a1..2a62b3c6c7 100644 --- a/src/corelib/codecs/cp949codetbl_p.h +++ b/src/corelib/codecs/cp949codetbl_p.h @@ -40,7 +40,7 @@ ****************************************************************************/ #ifndef CP949CODETBL_P_H -#define CP494CODETBL_P_H +#define CP949CODETBL_P_H // // W A R N I N G @@ -645,4 +645,4 @@ static const unsigned short cp949_icode_to_unicode[] = { 0xd7a2, 0xd7a3 }; -#endif // CP494CODETBL_P_H +#endif // CP949CODETBL_P_H |