John Preston 0562024444 Merge branch 'master' into player ... Conflicts: Telegram/SourceFiles/core/observer.h Telegram/SourceFiles/mainwindow.h Telegram/SourceFiles/media/view/media_clip_playback.cpp Telegram/SourceFiles/media/view/media_clip_playback.h		2016-09-29 00:16:02 +03:00
..
media_player.style	…
media_player_button.cpp	Merge branch 'master' into player	2016-09-29 00:16:02 +03:00
media_player_button.h	…
media_player_cover.cpp	…
media_player_cover.h	…
media_player_instance.cpp	Merge branch 'master' into player	2016-09-29 00:16:02 +03:00
media_player_instance.h	Merge branch 'master' into player	2016-09-29 00:16:02 +03:00
media_player_list.cpp	…
media_player_list.h	…
media_player_volume_controller.cpp	…
media_player_volume_controller.h	…
media_player_widget.cpp	Merge branch 'master' into player	2016-09-29 00:16:02 +03:00
media_player_widget.h	…