John Preston 1b54ccb59c Merge branch 'game_media' into player ... Conflicts: Telegram/Resources/basic.style Telegram/SourceFiles/media/player/media_player_list.cpp Telegram/SourceFiles/title.cpp		2016-09-30 20:07:56 +03:00
..
media_clip_controller.cpp	Merge branch 'master' into player	2016-09-29 00:16:02 +03:00
media_clip_controller.h	New audio player done (without playlist).	2016-09-23 19:04:26 +03:00
media_clip_playback.cpp	Merge branch 'master' into player	2016-09-29 00:16:02 +03:00
media_clip_playback.h	Removed Function<> and SharedCallback<>, using base::lambda_unique<>.	2016-09-26 15:09:59 +03:00
media_clip_volume_controller.cpp	Removed Function<> and SharedCallback<>, using base::lambda_unique<>.	2016-09-26 15:09:59 +03:00
media_clip_volume_controller.h	Removed Function<> and SharedCallback<>, using base::lambda_unique<>.	2016-09-26 15:09:59 +03:00
mediaview.style	Merge branch 'game_media' into player	2016-09-30 20:07:56 +03:00