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
..
overview.style	Dialog styles moved from basic.style to dialogs.style.	2016-06-07 22:59:39 +03:00
overview_layout.cpp	Merge branch 'dev' into player	2016-10-08 12:10:33 +03:00
overview_layout.h	Removed some old styles. Divided basic_types module to several.	2016-09-29 14:37:16 +03:00