tdesktop/Telegram/Resources
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
..
art Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
etc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
icons Software animated play/pause title button ready, icons for it removed. 2016-09-16 15:49:36 +03:00
langs Beta 10008003: langs updated. 2016-09-29 15:59:30 +03:00
qmime Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
winrc Beta 10008003: langs updated. 2016-09-29 15:59:30 +03:00
basic.style Merge branch 'game_media' into player 2016-09-29 16:48:43 +03:00
basic_types.style Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
numbers.txt merged master 2015-08-18 19:10:01 +03:00
telegram.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_emojis.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_linux.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_mac.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_wnd.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00