John Preston 0562024444 Merge branch 'master' into player ... Conflicts: Telegram/SourceFiles/core/observer.h Telegram/SourceFiles/mainwindow.h Telegram/SourceFiles/media/view/media_clip_playback.cpp Telegram/SourceFiles/media/view/media_clip_playback.h		2016-09-29 00:16:02 +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	Software animated play/pause title button ready, icons for it removed.	2016-09-16 15:49:36 +03:00
langs	Languages updated. Build in Xcode fixed.	2016-09-20 16:03:42 +03:00
qmime	Moved .qrc, langs and art files from SourceFiles to Resources folder.	2016-04-09 17:17:09 +04:00
winrc	Beta 10008001: moved all Notify::Observer-s to base::Subscriber-s.	2016-09-26 21:33:34 +03:00
basic.style	Software animated play/pause title button ready, icons for it removed.	2016-09-16 15:49:36 +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