RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
tdesktop/Telegram/Resources
History
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
..
art New style::icon class added, colorized icons by codegen_style. 2016-04-21 20:57:29 +03:00
etc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
icons Merge branch 'profile' into drafts 2016-06-06 18:16:52 +03:00
langs Merge branch 'profile' into drafts 2016-06-06 18:16:52 +03:00
qmime Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
winrc Fixed build in QtCreator. Closed beta 9049001 for profiles testing. 2016-06-06 14:57:02 +03:00
all_files.style New profiles Xcode build ready, couple of retina-support bugs fixed. 2016-06-06 14:35:49 +03:00
basic.style Merge branch 'profile' into drafts 2016-06-06 18:16:52 +03:00
basic_types.style Settings block in the new profile implementation done. 2016-06-01 16:07:03 +03:00
numbers.txt merged master 2015-08-18 19:10:01 +03:00
telegram.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_emojis.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_linux.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_mac.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_wnd.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00