John Preston 5b3ac58578 Merge branch 'game_media' into player ... Conflicts: Telegram/SourceFiles/core/basic_types.h Telegram/SourceFiles/sysbuttons.h Telegram/SourceFiles/title.cpp		2016-09-29 16:48:43 +03:00
..
linux	GYP build for Linux done: GYP -> CMake -> make. Testing.	2016-09-09 09:15:11 +03:00
mac	Most of the new Settings are done.	2016-08-26 22:49:18 -06:00
win	Merge branch 'game_media' into player	2016-09-29 16:48:43 +03:00
winrt	Moved PsMainWindow to Platform::MainWindow, outside of pspecific module.	2016-06-16 15:59:54 +03:00
platform_file_dialog.h	Using GTK file dialog when it is available.	2016-07-06 21:30:14 +03:00
platform_main_window.h	Moved PsMainWindow to Platform::MainWindow, outside of pspecific module.	2016-06-16 15:59:54 +03:00