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
..
common	New audio player done (without playlist).	2016-09-23 19:04:26 +03:00
numbers	Xcode build now uses codegen_style/numbers. Xcode projects created.	2016-04-19 13:59:59 +03:00
style	Merge branch 'dev' into player	2016-10-08 12:10:33 +03:00