John Preston 2aa35af909 Merge branch 'master' into dev ... Conflicts: Telegram/SourceFiles/history/history.style		2016-07-08 13:26:28 +03:00
..
art	Featured stickers fully supported (unread badges, box, adding, etc).	2016-06-28 21:05:38 +03:00
etc	Moved .qrc, langs and art files from SourceFiles to Resources folder.	2016-04-09 17:17:09 +04:00
icons	Featured stickers fully supported (unread badges, box, adding, etc).	2016-06-28 21:05:38 +03:00
langs	Merge branch 'master' into dev	2016-07-08 13:26:28 +03:00
qmime	Moved .qrc, langs and art files from SourceFiles to Resources folder.	2016-04-09 17:17:09 +04:00
winrc	Alpha version 0.9.57: some design improvements, GTK file chooser.	2016-07-07 19:32:34 +03:00
all_files.style	Build prepared for Xcode and hopefully for QtCreator. Closed beta 9049002.	2016-06-08 13:24:20 +03:00
basic.style	Merge branch 'master' into dev	2016-07-08 13:26:28 +03:00
basic_types.style	Some buttons and scroll bars style improvements.	2016-07-07 19:15:34 +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