1
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-29 23:08:09 +00:00
tdesktop/Telegram
John Preston 362b942a22 Merge branch 'same_peer_flag' into dev + fix style codegen rule desc.
Conflicts:
	Telegram/Telegram.vcxproj
	Telegram/Telegram.vcxproj.filters
2016-08-16 20:12:55 +03:00
..
build Crash fix for inline results clearing. Crash fix for GIF starting. 2016-08-15 10:39:12 +03:00
gyp Merge branch 'same_peer_flag' into dev + fix style codegen rule desc. 2016-08-16 20:12:55 +03:00
MetaEmoji.xcodeproj All Xcode projects updated to Qt 5.6.0. 2016-06-17 20:54:23 +03:00
MetaLang.xcodeproj Fixed build dependencies in Telegram/MetaLang/codegen Xcode projects. 2016-08-14 23:40:35 +03:00
Packer.xcodeproj All Xcode projects updated to Qt 5.6.0. 2016-06-17 20:54:23 +03:00
Patches Fixed client side waveform counter infinite loop. 2016-07-30 11:03:44 +01:00
Resources Merge branch 'same_peer_flag' into dev + fix style codegen rule desc. 2016-08-16 20:12:55 +03:00
SetupFiles
SourceFiles Merge branch 'same_peer_flag' into dev + fix style codegen rule desc. 2016-08-16 20:12:55 +03:00
Telegram/Images.xcassets
Telegram.xcodeproj Fixed build dependencies in Telegram/MetaLang/codegen Xcode projects. 2016-08-14 23:40:35 +03:00
ThirdParty/minizip using libs for google breakpad on windows 2016-02-05 16:31:24 +03:00
Updater.xcodeproj Merge branch 'dev' of https://bitbucket.org/johnprestonmail/telegram-desktop into dev 2016-04-14 15:02:57 +03:00
Emoji.plist moved to Qt 5.5.1, build docs for MSVC2015 and Xcode7 updated 2015-10-19 23:24:39 +02:00
Lang.plist moved to Qt 5.5.1, build docs for MSVC2015 and Xcode7 updated 2015-10-19 23:24:39 +02:00
MetaEmoji.pro Make possible to set a path to the patched Qt and his version during 2016-05-08 14:14:44 +06:00
MetaLang.pro Forced update of Telegram.plist in build script. Use c++14 flag in .pro. 2016-06-15 09:59:43 +03:00
Packer.plist moved to Qt 5.5.1, build docs for MSVC2015 and Xcode7 updated 2015-10-19 23:24:39 +02:00
Packer.pro Make possible to set a path to the patched Qt and his version during 2016-05-08 14:14:44 +06:00
qt_static.pri Merge pull request from BOOtak/env_variables 2016-07-07 12:04:29 +03:00
Telegram.plist Moved patches to Telegram/Patches, travis builds debug version. 2016-04-23 14:50:28 +03:00
Telegram.pro ConfirmPhoneBox added to Xcode and QtCreator projects. 2016-07-29 11:29:15 +01:00
Updater.pro