RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
tdesktop/Telegram/gyp
History
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
..
Telegram.gyp Merge branch 'dev' into settings 2016-08-16 20:19:57 +03:00
codegen.gyp
…
codegen_rules.gypi Merge branch 'same_peer_flag' into dev + fix style codegen rule desc. 2016-08-16 20:12:55 +03:00
common.gypi GYP/Ninja Windows build: complete, build scripts updated. 2016-08-14 21:08:55 +03:00
common_executable.gypi
…
create_env.py
…
official.py GYP/Ninja Windows build: complete, build scripts updated. 2016-08-14 21:08:55 +03:00
qt.gypi GYP/Ninja Windows build: complete, build scripts updated. 2016-08-14 21:08:55 +03:00
refresh.bat GYP/Ninja Windows build: complete, build scripts updated. 2016-08-14 21:08:55 +03:00
settings_win.gypi
…
update_dependent.py GYP/Ninja Windows build: complete, build scripts updated. 2016-08-14 21:08:55 +03:00
utils.gyp Build docs updated, .sln files added to .gitignore. 2016-08-14 21:41:31 +03:00