tdesktop/Telegram
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
..
build Beta 10008001: moved all Notify::Observer-s to base::Subscriber-s. 2016-09-26 21:33:34 +03:00
gyp New audio player done (without playlist). 2016-09-23 19:04:26 +03:00
Patches GYP build for Linux done: GYP -> CMake -> make. Testing. 2016-09-09 09:15:11 +03:00
Resources Merge branch 'master' into player 2016-09-29 00:16:02 +03:00
SetupFiles initial commit for 0.4.18 version of Telegram Desktop 2014-05-30 12:53:19 +04:00
SourceFiles Merge branch 'master' into player 2016-09-29 00:16:02 +03:00
Telegram Version for Mac App Store build from GYP ready, not tested yet. 2016-08-31 08:32:05 -06:00
ThirdParty/minizip using libs for google breakpad on windows 2016-02-05 16:31:24 +03:00
Telegram.plist Version for Mac App Store build from GYP ready, not tested yet. 2016-08-31 08:32:05 -06:00