tdesktop/Telegram/SourceFiles
John Preston 1b54ccb59c Merge branch 'game_media' into player
Conflicts:
	Telegram/Resources/basic.style
	Telegram/SourceFiles/media/player/media_player_list.cpp
	Telegram/SourceFiles/title.cpp
2016-09-30 20:07:56 +03:00
..
_other
boxes Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
codegen
core Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
data
dialogs Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
history Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
inline_bots Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
intro Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
media Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
mtproto Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
overview Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
platform Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
profile Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
serialize
settings Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
stickers Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
ui Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
window Removed Function<> and SharedCallback<>, using base::lambda_unique<>. 2016-09-26 15:09:59 +03:00
apiwrap.cpp New media type Game added. Display of Game partially supported. 2016-09-27 16:37:18 +03:00
apiwrap.h Removed Function<> and SharedCallback<>, using base::lambda_unique<>. 2016-09-26 15:09:59 +03:00
app.cpp Merge branch 'game_media' into player 2016-09-29 16:48:43 +03:00
app.h Moved History[Media] classes to history_media_types module. 2016-09-28 13:15:03 +03:00
application.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
application.h
autoupdater.cpp
autoupdater.h
config.h
countries.h
dialogswidget.cpp Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
dialogswidget.h imageLoaded() notifications done through base::Subscriber. 2016-09-26 16:57:08 +03:00
dropdown.cpp
dropdown.h
facades.cpp
facades.h Merge branch 'master' into player 2016-09-29 00:16:02 +03:00
fileuploader.cpp
fileuploader.h
history.cpp Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
history.h Game play send message action is supported. 2016-09-30 16:40:22 +03:00
historywidget.cpp Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
historywidget.h Removed Function<> and SharedCallback<>, using base::lambda_unique<>. 2016-09-26 15:09:59 +03:00
lang.cpp
lang.h
langloaderplain.cpp Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
langloaderplain.h
layerwidget.cpp Mixed channel access hash to the game score encrypted data. 2016-09-30 15:52:03 +03:00
layerwidget.h Media::Clip::Reader owners use Media::Clip::ReaderPointer smartptr. 2016-09-28 23:28:53 +03:00
layout.cpp Some parts from history module moved to history_[item,media,message]. 2016-09-27 17:20:49 +03:00
layout.h Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
localimageloader.cpp
localimageloader.h
localstorage.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
localstorage.h
logs.cpp Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
logs.h
main.cpp
mainwidget.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
mainwidget.h Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
mainwindow.cpp Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
mainwindow.h Merge branch 'master' into player 2016-09-29 00:16:02 +03:00
mediaview.cpp Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
mediaview.h Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
observer_peer.cpp Beta 10008001: moved all Notify::Observer-s to base::Subscriber-s. 2016-09-26 21:33:34 +03:00
observer_peer.h Beta 10008001: moved all Notify::Observer-s to base::Subscriber-s. 2016-09-26 21:33:34 +03:00
overviewwidget.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
overviewwidget.h Merge branch 'master' into player 2016-09-29 00:16:02 +03:00
passcodewidget.cpp Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
passcodewidget.h
playerwidget.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
playerwidget.h
pspecific.h
pspecific_linux.cpp
pspecific_linux.h
pspecific_mac.cpp Some langs updated. Build fixed for Xcode. 2016-09-29 00:33:05 +03:00
pspecific_mac.h
pspecific_mac_p.h
pspecific_mac_p.mm
pspecific_win.cpp New media type Game added. Display of Game partially supported. 2016-09-27 16:37:18 +03:00
pspecific_win.h
pspecific_winrt.cpp
pspecific_winrt.h
settings.cpp Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
settings.h
shortcuts.cpp
shortcuts.h
stdafx.cpp
stdafx.h Removed some old styles. Divided basic_types module to several. 2016-09-29 14:37:16 +03:00
structs.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
structs.h Merge branch 'game_media' into player 2016-09-29 16:48:43 +03:00
sysbuttons.cpp Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
sysbuttons.h Merge branch 'game_media' into player 2016-09-29 16:48:43 +03:00
title.cpp Merge branch 'game_media' into player 2016-09-30 20:07:56 +03:00
title.h