diff options
author | Joseph Donofry <joedonofry@gmail.com> | 2021-07-19 14:12:28 -0400 |
---|---|---|
committer | Joseph Donofry <joedonofry@gmail.com> | 2021-07-19 14:12:28 -0400 |
commit | a4754e79d2e5d8c3a490cd01989abd25dd360646 (patch) | |
tree | 44114ff7e7527346792931e69908f02109a366ec /resources/res.qrc | |
parent | Import and update lurkki's branch (diff) | |
parent | Fix reaction button again (diff) | |
download | nheko-a4754e79d2e5d8c3a490cd01989abd25dd360646.tar.xz |
Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements
Diffstat (limited to 'resources/res.qrc')
-rw-r--r-- | resources/res.qrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/resources/res.qrc b/resources/res.qrc index 1e7d0a25..d2024eda 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -27,6 +27,7 @@ <file>icons/ui/search@2x.png</file> <file>icons/ui/settings.png</file> <file>icons/ui/settings@2x.png</file> + <file>icons/ui/sticky-note-solid.svg</file> <file>icons/ui/smile.png</file> <file>icons/ui/smile@2x.png</file> <file>icons/ui/speech-bubbles-comment-option.png</file> @@ -151,8 +152,8 @@ <file>qml/ForwardCompleter.qml</file> <file>qml/TypingIndicator.qml</file> <file>qml/RoomSettings.qml</file> - <file>qml/emoji/EmojiButton.qml</file> <file>qml/emoji/EmojiPicker.qml</file> + <file>qml/emoji/StickerPicker.qml</file> <file>qml/UserProfile.qml</file> <file>qml/delegates/MessageDelegate.qml</file> <file>qml/delegates/TextMessage.qml</file> |