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 branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview

Browse Source 
Resolved Conflicts:
	daemon/src/account.cpp
	daemon/src/audio/audiortp/audio_rtp_session.h
	daemon/src/sip/sipvoiplink.cpp
	gnome/src/accountlist.h
	gnome/src/actions.c
	gnome/src/codeclist.c
	gnome/src/codeclist.h
	gnome/src/config/accountconfigdialog.c
	gnome/src/config/audioconf.c
	gnome/src/dbus/dbus.c
	gnome/tests/Makefile.am
This commit is contained in:
Tristan Matthews
2012-04-03 12:02:43 -04:00
parent 39f7d57ce6 0db8a5677b
commit d47564e88c
72 changed files with 3431 additions and 2986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -67,5 +67,9 @@ config_auto.h
# Ignore temp files
*~
# Cscope/Ctags files
cscope.*
tags
# IDE stuffs
nbproject