tdesktop/Telegram/Resources
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
..
art Playing game state is set for 10 seconds instead of 30. 2016-09-30 19:40:00 +03:00
etc
icons Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
langs Beta 10008005: langs updated, new playing game status added. 2016-09-30 16:43:38 +03:00
qmime
winrc Beta 10008005: langs updated, new playing game status added. 2016-09-30 16:43:38 +03:00
basic_types.style Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
basic.style Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
numbers.txt
telegram_emojis.qrc
telegram_linux.qrc
telegram_mac.qrc
telegram_wnd.qrc
telegram.qrc