John Preston 4a6e669a53 Merge branch 'dev' into settings ... Conflicts: Telegram/SourceFiles/boxes/addcontactbox.h Telegram/SourceFiles/boxes/confirmbox.h		2016-08-16 20:19:57 +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 'dev' into settings	2016-08-16 20:19:57 +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	…
Updater.xcodeproj	…
build	Crash fix for inline results clearing. Crash fix for GIF starting.	2016-08-15 10:39:12 +03:00
gyp	Merge branch 'dev' into settings	2016-08-16 20:19:57 +03:00
Emoji.plist	…
Lang.plist	…
MetaEmoji.pro	…
MetaLang.pro	…
Packer.plist	…
Packer.pro	…
Telegram.plist	…
Telegram.pro	ConfirmPhoneBox added to Xcode and QtCreator projects.	2016-07-29 11:29:15 +01:00
Updater.pro	…
qt_static.pri	Merge pull request #2226 from BOOtak/env_variables	2016-07-07 12:04:29 +03:00