tdesktop/Telegram/SourceFiles/overview
John Preston 1b54ccb59c Merge branch 'game_media' into player
Conflicts:
	Telegram/Resources/basic.style
	Telegram/SourceFiles/media/player/media_player_list.cpp
	Telegram/SourceFiles/title.cpp
2016-09-30 20:07:56 +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 'game_media' into player 2016-09-30 20:07:56 +03:00
overview_layout.h Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00