procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2014-07-13 21:44:49 +04:00
parent fb05cf6cb3 3ef0ed1453
commit 507075ceea
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/Resources/style.txt
View File

@ -960,9 +960,9 @@ unreadBarColor: #538bb4;
searchedBarHeight: unreadBarHeight; searchedBarHeight: unreadBarHeight;
searchedBarFont: unreadBarFont; searchedBarFont: unreadBarFont;
searchedBarBG: #f1f1f1; searchedBarBG: #ebeef1;
searchedBarBorder: unreadBarBorder; searchedBarBorder: unreadBarBorder;
searchedBarColor: #aaa; searchedBarColor: #a2aeb7;
layerSlideDuration: 200; layerSlideDuration: 200;
layerHideDuration: 200; layerHideDuration: 200;

6
Telegram/Setup.iss
View File

@ -3,9 +3,9 @@
#define MyAppShortName "Telegram" #define MyAppShortName "Telegram"
#define MyAppName "Telegram Win (Unofficial)" #define MyAppName "Telegram Win (Unofficial)"
#define MyAppVersion "0.5.6" #define MyAppVersion "0.5.7"
#define MyAppVersionZero "0.5.6" #define MyAppVersionZero "0.5.7"
#define MyAppFullVersion "0.5.6.0" #define MyAppFullVersion "0.5.7.0"
#define MyAppPublisher "Telegram (Unofficial)" #define MyAppPublisher "Telegram (Unofficial)"
#define MyAppURL "https://tdesktop.com" #define MyAppURL "https://tdesktop.com"
#define MyAppExeName "Telegram.exe" #define MyAppExeName "Telegram.exe"

6
Telegram/SourceFiles/historywidget.cpp
View File

@ -1452,11 +1452,11 @@ HistoryWidget::HistoryWidget(QWidget *parent) : QWidget(parent)
, histPeer(0) , histPeer(0)
, _activeHist(0) , _activeHist(0)
, histPreloading(0) , histPreloading(0)
, _scroll(this, st::historyScroll, false)
, _list(0)
, hist(0)
, _loadingAroundId(-1) , _loadingAroundId(-1)
, _loadingAroundRequest(0) , _loadingAroundRequest(0)
, _scroll(this, st::historyScroll, false)
, _list(0)
, hist(0)
, _histInited(false) , _histInited(false)
, _toHistoryEnd(this, st::historyToEnd) , _toHistoryEnd(this, st::historyToEnd)
, _send(this, lang(lng_send_button), st::btnSend) , _send(this, lang(lng_send_button), st::btnSend)

BIN
Telegram/Telegram.rc
View File

Binary file not shown.