kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity
2207 commits 13 branches 45 tags 237 MiB
Commit graph

3 commits

Author SHA1 Message Date
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
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
John Preston
f970ac3163 New audio player done (without playlist). 2016-09-23 19:04:26 +03:00