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
..
project.pbxproj	Merge branch 'master' into video	2016-07-11 21:12:10 +03:00
qt_preprocess.mak	Moved audio to media/media_audio and divided to several modules.	2016-07-05 20:44:02 +03:00