kotatogram-desktop/Telegram/SourceFiles
John Preston 903795d0e5 Merge branch 'game_media' into player
Conflicts:
	Telegram/SourceFiles/application.cpp
	Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/mainwidget.h
	Telegram/SourceFiles/structs.h
2016-09-29 00:31:43 +03:00
..
_other
boxes Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
codegen
core Merge branch 'master' into player 2016-09-29 00:16:02 +03:00
data
dialogs
history Media::Clip::Reader owners use Media::Clip::ReaderPointer smartptr. 2016-09-28 23:28:53 +03:00
inline_bots Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
intro
media Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
mtproto Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
overview Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
platform
profile
serialize
settings Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
stickers
ui Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
window
apiwrap.cpp
apiwrap.h
app.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
app.h
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
dialogswidget.h
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-29 00:31:43 +03:00
history.h
historywidget.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
historywidget.h
lang.cpp
lang.h
langloaderplain.cpp
langloaderplain.h
layerwidget.cpp Media::Clip::Reader owners use Media::Clip::ReaderPointer smartptr. 2016-09-28 23:28:53 +03:00
layerwidget.h Media::Clip::Reader owners use Media::Clip::ReaderPointer smartptr. 2016-09-28 23:28:53 +03:00
layout.cpp
layout.h
localimageloader.cpp
localimageloader.h
localstorage.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
localstorage.h
logs.cpp
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 'master' into player 2016-09-29 00:16:02 +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-29 00:31:43 +03:00
mediaview.h Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
observer_peer.cpp
observer_peer.h
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
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
pspecific_mac.h
pspecific_mac_p.h
pspecific_mac_p.mm
pspecific_win.cpp
pspecific_win.h
pspecific_winrt.cpp
pspecific_winrt.h
settings.cpp
settings.h
shortcuts.cpp
shortcuts.h
stdafx.cpp
stdafx.h
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 00:31:43 +03:00
sysbuttons.cpp
sysbuttons.h
title.cpp
title.h