John Preston e616c39608 Merge branch 'dev' into player ... Conflicts: Telegram/SourceFiles/application.cpp Telegram/SourceFiles/core/utils.h Telegram/SourceFiles/localstorage.cpp Telegram/SourceFiles/pspecific_mac_p.mm		2016-10-08 12:10:33 +03:00
..
art	Version 0.10.9: langs updated, moved shadow icons to separate files.	2016-10-01 15:35:52 +03:00
etc	Moved .qrc, langs and art files from SourceFiles to Resources folder.	2016-04-09 17:17:09 +04:00
icons	Merge branch 'dev' into player	2016-10-08 12:10:33 +03:00
langs	Version 0.10.12.alpha: major notifications update.	2016-10-07 16:24:19 +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.13.alpha: crash fix in custom notifications.	2016-10-07 19:45:45 +03:00
basic.style	Merge branch 'dev' into player	2016-10-08 12:10:33 +03:00
basic_types.style	Version 0.10.9: langs updated, moved shadow icons to separate files.	2016-10-01 15:35:52 +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