e616c39608
Conflicts: Telegram/SourceFiles/application.cpp Telegram/SourceFiles/core/utils.h Telegram/SourceFiles/localstorage.cpp Telegram/SourceFiles/pspecific_mac_p.mm |
||
|---|---|---|
| .. | ||
| media_player.style | ||
| media_player_button.cpp | ||
| media_player_button.h | ||
| media_player_cover.cpp | ||
| media_player_cover.h | ||
| media_player_instance.cpp | ||
| media_player_instance.h | ||
| media_player_list.cpp | ||
| media_player_list.h | ||
| media_player_volume_controller.cpp | ||
| media_player_volume_controller.h | ||
| media_player_widget.cpp | ||
| media_player_widget.h | ||