mirror of https://github.com/procxx/kepka.git
Conflicts: Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/ui/animation.cpp Telegram/Telegram.pro |
||
|---|---|---|
| .. | ||
| project.pbxproj | ||
| qt_preprocess.mak | ||
Conflicts: Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/ui/animation.cpp Telegram/Telegram.pro |
||
|---|---|---|
| .. | ||
| project.pbxproj | ||
| qt_preprocess.mak | ||