diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2012-02-29 09:24:30 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2012-02-29 09:24:30 +0000 |
| commit | 2119d43b7a5256681a6cdb3ef90d365e876885ab (patch) | |
| tree | 7d57731ec7f843290208fcfa9603d085899f7970 /resources/images | |
| parent | 53cbf39921545f336bab4b4ef1aece8c5fd63621 (diff) | |
| download | jitsi-2119d43b7a5256681a6cdb3ef90d365e876885ab.zip jitsi-2119d43b7a5256681a6cdb3ef90d365e876885ab.tar.gz jitsi-2119d43b7a5256681a6cdb3ef90d365e876885ab.tar.bz2 | |
Adds support for merging all existing calls in a single conference.
Diffstat (limited to 'resources/images')
| -rw-r--r-- | resources/images/images.properties | 1 | ||||
| -rw-r--r-- | resources/images/impl/gui/buttons/mergeCall.png | bin | 0 -> 436 bytes |
2 files changed, 1 insertions, 0 deletions
diff --git a/resources/images/images.properties b/resources/images/images.properties index 5c6a062..e483ebf 100644 --- a/resources/images/images.properties +++ b/resources/images/images.properties @@ -198,6 +198,7 @@ service.gui.buttons.EDIT_TOOLBAR_BUTTON_PRESSED=resources/images/impl/gui/button service.gui.buttons.DIAL_BUTTON=resources/images/impl/gui/buttons/dialButton.png service.gui.buttons.HOLD_BUTTON=resources/images/impl/gui/buttons/holdButton.png service.gui.buttons.HOLD_BUTTON_PRESSED=resources/images/impl/gui/buttons/holdButtonPressed.png +service.gui.buttons.MERGE_CALL_BUTTON=resources/images/impl/gui/buttons/mergeCall.png service.gui.buttons.MUTE_BUTTON=resources/images/impl/gui/buttons/muteButton.png service.gui.buttons.MUTE_BUTTON_PRESSED=resources/images/impl/gui/buttons/muteButtonPressed.png service.gui.buttons.RECORD_BUTTON=resources/images/impl/gui/buttons/recordButton.png diff --git a/resources/images/impl/gui/buttons/mergeCall.png b/resources/images/impl/gui/buttons/mergeCall.png Binary files differnew file mode 100644 index 0000000..1eb3021 --- /dev/null +++ b/resources/images/impl/gui/buttons/mergeCall.png |
