tdesktop/Telegram/SourceFiles/overview
John Preston 903795d0e5 Merge branch 'game_media' into player
Conflicts:
	Telegram/SourceFiles/application.cpp
	Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/mainwidget.h
	Telegram/SourceFiles/structs.h
2016-09-29 00:31:43 +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-29 00:31:43 +03:00
overview_layout.h Moved History[Media] classes to history_media_types module. 2016-09-28 13:15:03 +03:00