forked from pool/telegram-desktop
Accepting request 661299 from home:nuklly:branches:server:messaging
Fixed bugs in patch OBS-URL: https://build.opensuse.org/request/show/661299 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=58
This commit is contained in:
parent
42629716f6
commit
9a71f458ea
@ -7,11 +7,7 @@ Index: tdesktop-1.2.6/Telegram/Resources/qrc/telegram_linux.qrc
|
|||||||
<qresource prefix="/qt">
|
<qresource prefix="/qt">
|
||||||
- <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
|
- <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<<<<<<< ./tdesktop.patch.mine
|
|
||||||
</RCC>
|
|
||||||
=======
|
|
||||||
<qresource prefix="/fc">
|
<qresource prefix="/fc">
|
||||||
>>>>>>> ./tdesktop.patch.rc44a18716743178f1d760ce699dba268
|
|
||||||
Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp
|
Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
|
Loading…
Reference in New Issue
Block a user