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

..

discrete_slider.cpp

Notifications settings done: screen corner selection + max count.

2016-10-06 19:41:09 +03:00

discrete_slider.h

Notifications settings done: screen corner selection + max count.

2016-10-06 19:41:09 +03:00

label_simple.cpp

Video play progress displayed in MediaView (in case of audio stream).

2016-07-12 14:38:16 +03:00

label_simple.h

Video play progress displayed in MediaView (in case of audio stream).

2016-07-12 14:38:16 +03:00

media_slider.cpp

Disabling playback seeking in new media player when loading audio.

2016-09-30 21:10:54 +03:00

media_slider.h

Disabling playback seeking in new media player when loading audio.

2016-09-30 21:10:54 +03:00

widget_slide_wrap.h

New settings build ready in Xcode.

2016-08-28 14:23:32 -06:00

widgets.style

Merge branch 'dev' into player

2016-10-08 12:10:33 +03:00