kotatogram-desktop/Telegram/SourceFiles/core
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
..
basic_types.h
click_handler.cpp
click_handler.h
click_handler_types.cpp
click_handler_types.h
lambda_wrap.h
observer.cpp
observer.h
ordered_set.h
qthelp_regex.h
qthelp_url.cpp
qthelp_url.h
runtime_composer.cpp
runtime_composer.h
single_timer.cpp
single_timer.h
stl_subset.h
utils.cpp
utils.h
vector_of_moveable.h
version.h