520260f207
Conflicts: Telegram/SourceFiles/app.cpp Telegram/SourceFiles/codegen/style/processor.cpp Telegram/SourceFiles/history.cpp Telegram/SourceFiles/historywidget.cpp Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/mainwidget.h Telegram/SourceFiles/profilewidget.cpp Telegram/SourceFiles/profilewidget.h Telegram/Telegram.vcxproj Telegram/Telegram.vcxproj.filters |
||
|---|---|---|
| .. | ||
| art | ||
| etc | ||
| icons | ||
| langs | ||
| qmime | ||
| winrc | ||
| all_files.style | ||
| basic.style | ||
| basic_types.style | ||
| numbers.txt | ||
| telegram.qrc | ||
| telegram_emojis.qrc | ||
| telegram_linux.qrc | ||
| telegram_mac.qrc | ||
| telegram_wnd.qrc | ||