tdesktop/Telegram/SourceFiles/ui/widgets
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
..
label_simple.cpp Video play progress displayed in MediaView (in case of audio stream). 2016-07-12 14:38:16 +03:00
label_simple.h Video play progress displayed in MediaView (in case of audio stream). 2016-07-12 14:38:16 +03:00
media_slider.cpp Merge branch 'master' into player 2016-09-29 00:16:02 +03:00
media_slider.h New audio player done (without playlist). 2016-09-23 19:04:26 +03:00
widget_slide_wrap.h New settings build ready in Xcode. 2016-08-28 14:23:32 -06:00
widgets.style New audio player done (without playlist). 2016-09-23 19:04:26 +03:00