John Preston d806d079a2 Merge branch 'master' into video ... Conflicts: Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/ui/animation.cpp Telegram/Telegram.pro		2016-07-11 21:12:10 +03:00
..
view
media_audio.cpp
media_audio.h
media_audio_ffmpeg_loader.cpp
media_audio_ffmpeg_loader.h
media_audio_loader.cpp
media_audio_loader.h
media_audio_loaders.cpp
media_audio_loaders.h
media_child_ffmpeg_loader.cpp
media_child_ffmpeg_loader.h
media_clip_ffmpeg.cpp
media_clip_ffmpeg.h
media_clip_implementation.cpp
media_clip_implementation.h
media_clip_qtgif.cpp
media_clip_qtgif.h
media_clip_reader.cpp
media_clip_reader.h