procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2015-09-23 13:39:50 +03:00
parent c6cd679bc1 107c78b4aa
commit 4d3851ab16
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/historywidget.h
View File

@ -200,7 +200,7 @@ public:
// \xcc[\xb3\xbf\x8a] // 819, 831, 778 // \xcc[\xb3\xbf\x8a] // 819, 831, 778
// QString bad1 = QString::fromUtf8("\xcc\xb3"), bad2 = QString::fromUtf8("\xcc\xbf"), bad3 = QString::fromUtf8("\xcc\x8a"); // QString bad1 = QString::fromUtf8("\xcc\xb3"), bad2 = QString::fromUtf8("\xcc\xbf"), bad3 = QString::fromUtf8("\xcc\x8a");
// [\x00\x01\x02\x07\x08\x0b-\x1f] // '\t' = 0x09 // [\x00\x01\x02\x07\x08\x0b-\x1f] // '\t' = 0x09
return (code >= 0x00 && code <= 0x02) || (code >= 0x07 && code <= 0x09) || (code >= 0x0b && code <= 0x1f) || return (/*code >= 0x00 && */code <= 0x02) || (code >= 0x07 && code <= 0x09) || (code >= 0x0b && code <= 0x1f) ||
(code == 819) || (code == 831) || (code == 778) || (code >= 8232 && code <= 8237); (code == 819) || (code == 831) || (code == 778) || (code >= 8232 && code <= 8237);
} }

2
Telegram/Telegram.pro
View File

@ -125,7 +125,6 @@ SOURCES += \
./SourceFiles/gui/boxshadow.cpp \ ./SourceFiles/gui/boxshadow.cpp \
./SourceFiles/gui/button.cpp \ ./SourceFiles/gui/button.cpp \
./SourceFiles/gui/contextmenu.cpp \ ./SourceFiles/gui/contextmenu.cpp \
./SourceFiles/gui/countrycodeinput.cpp \
./SourceFiles/gui/countryinput.cpp \ ./SourceFiles/gui/countryinput.cpp \
./SourceFiles/gui/emoji_config.cpp \ ./SourceFiles/gui/emoji_config.cpp \
./SourceFiles/gui/filedialog.cpp \ ./SourceFiles/gui/filedialog.cpp \
@ -219,7 +218,6 @@ HEADERS += \
./SourceFiles/gui/boxshadow.h \ ./SourceFiles/gui/boxshadow.h \
./SourceFiles/gui/button.h \ ./SourceFiles/gui/button.h \
./SourceFiles/gui/contextmenu.h \ ./SourceFiles/gui/contextmenu.h \
./SourceFiles/gui/countrycodeinput.h \
./SourceFiles/gui/countryinput.h \ ./SourceFiles/gui/countryinput.h \
./SourceFiles/gui/emoji_config.h \ ./SourceFiles/gui/emoji_config.h \
./SourceFiles/gui/filedialog.h \ ./SourceFiles/gui/filedialog.h \