John Preston 86982da5f7 Merge branch 'master' into games ... Conflicts: Telegram/Telegram.pro		2016-09-12 16:35:17 +03:00
..
art	Featured stickers section done in StickersPanel.	2016-09-09 18:52:46 +03:00
etc	Moved .qrc, langs and art files from SourceFiles to Resources folder.	2016-04-09 17:17:09 +04:00
icons	Started a special LayerWidget: Settings::Widget.	2016-08-18 12:52:36 +03:00
langs	Merge branch 'master' into games	2016-09-12 16:35:17 +03:00
qmime	Moved .qrc, langs and art files from SourceFiles to Resources folder.	2016-04-09 17:17:09 +04:00
winrc	Version 0.10.5: new settings. First stable version on GYP.	2016-09-12 15:02:52 +03:00
all_files.style	New settings build ready in Xcode.	2016-08-28 14:23:32 -06:00
basic.style	Featured stickers section done in StickersPanel.	2016-09-09 18:52:46 +03:00
basic_types.style	Merge branch 'master' into video	2016-07-11 21:12:10 +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