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 |
||
---|---|---|
.. | ||
introcode.cpp | ||
introcode.h | ||
introphone.cpp | ||
introphone.h | ||
intropwdcheck.cpp | ||
intropwdcheck.h | ||
introsignup.cpp | ||
introsignup.h | ||
introstart.cpp | ||
introstart.h | ||
introwidget.cpp | ||
introwidget.h |