Commit Graph

4 Commits

Author SHA1 Message Date
John Preston e616c39608 Merge branch 'dev' into player
Conflicts:
	Telegram/SourceFiles/application.cpp
	Telegram/SourceFiles/core/utils.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/SourceFiles/pspecific_mac_p.mm
2016-10-08 12:10:33 +03:00
John Preston f970ac3163 New audio player done (without playlist). 2016-09-23 19:04:26 +03:00
John Preston ce1973fd30 New media player layout started. 2016-09-17 22:28:33 +03:00
John Preston 298bd2a476 New player icons and sources created. 2016-09-15 19:32:49 +03:00