John Preston 520260f207 Merge branch 'profile' into drafts ... Conflicts: Telegram/SourceFiles/app.cpp Telegram/SourceFiles/codegen/style/processor.cpp Telegram/SourceFiles/history.cpp Telegram/SourceFiles/historywidget.cpp Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/mainwidget.h Telegram/SourceFiles/profilewidget.cpp Telegram/SourceFiles/profilewidget.h Telegram/Telegram.vcxproj Telegram/Telegram.vcxproj.filters		2016-06-06 18:16:52 +03:00
..
build	Fixed build in QtCreator. Closed beta 9049001 for profiles testing.	2016-06-06 14:57:02 +03:00
MetaEmoji.xcodeproj
MetaLang.xcodeproj
Packer.xcodeproj
Patches	Removed WinRT QFile::copy() fix from Qt patch: change approved to Qt.	2016-05-02 17:56:00 +03:00
Resources	Merge branch 'profile' into drafts	2016-06-06 18:16:52 +03:00
SetupFiles
SourceFiles	Merge branch 'profile' into drafts	2016-06-06 18:16:52 +03:00
Telegram/Images.xcassets
Telegram.xcodeproj	New profiles Xcode build ready, couple of retina-support bugs fixed.	2016-06-06 14:35:49 +03:00
ThirdParty/minizip
Updater.xcodeproj
Emoji.plist
Lang.plist
MetaEmoji.pro	Make possible to set a path to the patched Qt and his version during	2016-05-08 14:14:44 +06:00
MetaEmoji.vcxproj
MetaEmoji.vcxproj.filters
MetaLang.pro	Make possible to set a path to the patched Qt and his version during	2016-05-08 14:14:44 +06:00
MetaLang.vcxproj
MetaLang.vcxproj.filters	Moving build / lang scripts from Telegram to subfolders.	2016-04-27 15:02:17 +03:00
Packer.plist
Packer.pro	Make possible to set a path to the patched Qt and his version during	2016-05-08 14:14:44 +06:00
Packer.vcxproj	MSVC project files fixed.	2016-05-03 20:03:02 +03:00
Packer.vcxproj.filters	Moving build / lang scripts from Telegram to subfolders.	2016-04-27 15:02:17 +03:00
qt_static.pri	Make possible to set a path to the patched Qt and his version during	2016-05-08 14:14:44 +06:00
Telegram.plist	Moved patches to Telegram/Patches, travis builds debug version.	2016-04-23 14:50:28 +03:00
Telegram.pro	Fixed build in QtCreator. Closed beta 9049001 for profiles testing.	2016-06-06 14:57:02 +03:00
Telegram.vcxproj	Merge branch 'profile' into drafts	2016-06-06 18:16:52 +03:00
Telegram.vcxproj.filters	Merge branch 'profile' into drafts	2016-06-06 18:16:52 +03:00
Updater.pro
Updater.vcxproj	Moving build / lang scripts from Telegram to subfolders.	2016-04-27 15:02:17 +03:00
Updater.vcxproj.filters	Moving build / lang scripts from Telegram to subfolders.	2016-04-27 15:02:17 +03:00