kotatogram-desktop/Telegram/SourceFiles/ui
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
..
buttons
effects
style
text
toast
widgets Merge branch 'dev' into player 2016-10-08 12:10:33 +03:00
animation.cpp
animation.h
button.cpp
button.h
countryinput.cpp
countryinput.h
emoji_config.cpp
emoji_config.h
filedialog.cpp
filedialog.h
flatbutton.cpp
flatbutton.h
flatcheckbox.cpp
flatcheckbox.h
flatinput.cpp
flatinput.h
flatlabel.cpp Merge branch 'dev' into player 2016-10-08 12:10:33 +03:00
flatlabel.h Merge branch 'dev' into player 2016-10-08 12:10:33 +03:00
flattextarea.cpp
flattextarea.h
images.cpp
images.h
inner_dropdown.cpp
inner_dropdown.h
popupmenu.cpp
popupmenu.h
scrollarea.cpp
scrollarea.h
twidget.cpp
twidget.h