Conflicts: Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/ui/animation.cpp Telegram/Telegram.pro |
||
|---|---|---|
| .. | ||
| basic_types.cpp | ||
| basic_types.h | ||
| click_handler.cpp | ||
| click_handler.h | ||
| click_handler_types.cpp | ||
| click_handler_types.h | ||
| observer.cpp | ||
| observer.h | ||
| vector_of_moveable.h | ||
| version.h | ||