diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2021-01-11 17:51:39 -0500 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2021-01-11 17:51:39 -0500 |
| commit | 3ff8b3ad8c015d45a515ca381691cae43fc32a00 (patch) | |
| tree | edec1d1e7926d9c0e0beb68ca604cc6bcdc1ebf6 /resources/res.qrc | |
| parent | Add Ripple effects to qml buttons and avatar (diff) | |
| parent | Merge pull request #372 from deepbluev7/fix-pr-CI (diff) | |
| download | nheko-3ff8b3ad8c015d45a515ca381691cae43fc32a00.tar.xz | |
Merge master and fix conflicts
Diffstat (limited to 'resources/res.qrc')
| -rw-r--r-- | resources/res.qrc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/resources/res.qrc b/resources/res.qrc index 9b05575e..0603d19c 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -123,7 +123,6 @@ <file>qtquickcontrols2.conf</file> <file>qml/TimelineView.qml</file> - <file>qml/ActiveCallBar.qml</file> <file>qml/Avatar.qml</file> <file>qml/Completer.qml</file> <file>qml/EncryptionIndicator.qml</file> @@ -139,7 +138,6 @@ <file>qml/TimelineRow.qml</file> <file>qml/TopBar.qml</file> <file>qml/TypingIndicator.qml</file> - <file>qml/VideoCall.qml</file> <file>qml/emoji/EmojiButton.qml</file> <file>qml/emoji/EmojiPicker.qml</file> <file>qml/UserProfile.qml</file> @@ -159,7 +157,16 @@ <file>qml/device-verification/NewVerificationRequest.qml</file> <file>qml/device-verification/Failed.qml</file> <file>qml/device-verification/Success.qml</file> +<<<<<<< HEAD <file>qml/ui/Ripple.qml</file> +======= + <file>qml/voip/ActiveCallBar.qml</file> + <file>qml/voip/CallDevices.qml</file> + <file>qml/voip/CallInviteBar.qml</file> + <file>qml/voip/DeviceError.qml</file> + <file>qml/voip/PlaceCall.qml</file> + <file>qml/voip/VideoCall.qml</file> +>>>>>>> b8b642219db37b1bf46ae47c01a446a7a4e24317 </qresource> <qresource prefix="/media"> <file>media/ring.ogg</file> |