Merge branch 'master' of belledonne-communications.com:linphone-private into dev_sal

This commit is contained in:
Simon Morlat 2010-03-10 21:50:00 +01:00
commit 063776dad4
5 changed files with 3 additions and 1 deletions

View file

@ -8,6 +8,7 @@ sip-busy.png sip-closed.png \
sip-online.png sip-otl.png \
sip-otp.png sip-wfa.png \
green.png red.png \
mic_muted.png mic_active.png
mic_muted.png mic_active.png \
linphone-3-250x130.png linphone-3.png linphone2-57x57.png
EXTRA_DIST=$(pixmap_DATA)

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
pixmaps/linphone-3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

BIN
pixmaps/linphone2-57x57.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

View file

@ -4,6 +4,7 @@ SUBDIRS=C fr it ja cs
LINPHONE_SOUNDS=ringback.wav hello8000.wav hello16000.wav
LINPHONE_RINGS=rings/orig.wav \
rings/oldphone.wav \
rings/oldphone-mono.wav \
rings/rock.wav \
rings/bigben.wav \
rings/toy.wav \