John Preston 5b3ac58578 Merge branch 'game_media' into player ...

Conflicts:
	Telegram/SourceFiles/core/basic_types.h
	Telegram/SourceFiles/sysbuttons.h
	Telegram/SourceFiles/title.cpp

2016-09-29 16:48:43 +03:00

..

overview_layout.cpp

Merge branch 'game_media' into player

2016-09-29 00:31:43 +03:00

overview_layout.h

Removed some old styles. Divided basic_types module to several.

2016-09-29 14:37:16 +03:00

overview.style

Dialog styles moved from basic.style to dialogs.style.

2016-06-07 22:59:39 +03:00