tdesktop/Telegram/build
John Preston dbdf28d0a0 Version bumped to 0.9.61 stable.
Merge branch 'archived_stickers' into cancel_reset.

Conflicts:
	Telegram/Resources/winrc/Telegram.rc
	Telegram/Resources/winrc/Updater.rc
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/Telegram.vcxproj.filters
	Telegram/Telegram.xcodeproj/project.pbxproj
	Telegram/build/version
2016-07-25 22:54:40 +03:00
..
qmake Moved to g++ 4.9, fixed some warnings, codegen used for Linux build. 2016-04-19 16:52:51 +03:00
vc Moving build / lang scripts from Telegram to subfolders. 2016-04-27 15:02:17 +03:00
xcode All Xcode projects updated to Qt 5.6.0. 2016-06-17 20:54:23 +03:00
build.bat Build bat on Windows forces styles rebuild. MSVC project fixed for 9049002. 2016-06-08 14:33:49 +03:00
build.sh Replace hard-coded paths with pkg-config 2016-07-11 03:32:13 +03:00
deploy.sh Build scripts improved, QtCreator build fixed. 2016-04-27 16:59:08 +03:00
makefile_static.sh Fixed build for QtCreator and Ubuntu. 2016-07-19 21:09:34 +03:00
replace.vbs Added moved files to git. 2016-04-27 15:03:10 +03:00
set_version.bat Build scripts improved, QtCreator build fixed. 2016-04-27 16:59:08 +03:00
set_version.sh Build scripts work both in Linux and OS X now. 2016-06-08 14:05:08 +03:00
setup.iss Added moved files to git. 2016-04-27 15:03:10 +03:00
version Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00