jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into video_preview

Browse Source 
Conflicts:
	daemon/src/audio/codecs/audiocodecfactory.cpp
	daemon/src/history/historyitem.cpp
	daemon/src/managerimpl.cpp
	daemon/src/sip/sdpmedia.cpp
	gnome/src/callable_obj.c

Also fix bugs in codec list
This commit is contained in:
Rafaël Carré
2011-08-16 09:40:51 -04:00
parent 20b697bd0c 2d1c2b8fcf
commit b68ed6803c
56 changed files with 544 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -144,7 +144,7 @@ config_auto.h
/gnome/install-sh
/gnome/missing
/gnome/mkinstalldirs
/gnome/src/gnome
/gnome/src/sflphone-client-gnome
/gnome/autom4te*
/gnome/sflphone.desktop
/gnome/confdefs.h