mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-07 22:02:12 +08:00
d47564e88c
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
76 lines
770 B
Plaintext
76 lines
770 B
Plaintext
# Ignore unused objects
|
|
*.lo
|
|
*.o
|
|
*.a
|
|
*.la
|
|
*.Po
|
|
*.Plo
|
|
*.loT
|
|
*.Tpo
|
|
Makefile.in
|
|
Makefile
|
|
/config.*
|
|
*.swp
|
|
*.so
|
|
*.raw
|
|
*.pod
|
|
.libs
|
|
.deps
|
|
|
|
autom4te.cache
|
|
config.guess
|
|
config.*
|
|
configure
|
|
depcomp
|
|
install-sh
|
|
INSTALL
|
|
missing
|
|
stamp-h1
|
|
ltmain.sh
|
|
|
|
# Binary translation files
|
|
*.mo
|
|
libtool
|
|
# The test binary
|
|
*Tester
|
|
*orig
|
|
*.1
|
|
*-glue.h
|
|
|
|
# Ignore rendered docs
|
|
doc/doxygen/core-doc
|
|
doc/doxygen/gtk-gui-doc
|
|
doc/*.html
|
|
|
|
# PJSIP files
|
|
*.depend
|
|
*i686-pc-linux-gnu
|
|
*pjlib-util-test-*
|
|
*pjlib-test-*
|
|
*pjmedia-test-*
|
|
*pjnath-test-*
|
|
*pjturn-client-*
|
|
*pjturn-srv-*
|
|
*pjsua-*
|
|
*pjsystest-*
|
|
*x86_64-unknown-*
|
|
sip_autoconf.h
|
|
os-auto.mak
|
|
build.mak
|
|
config.log
|
|
config.status
|
|
m_auto.h
|
|
os_auto.h
|
|
config_site.h
|
|
config_auto.h
|
|
|
|
# Ignore temp files
|
|
*~
|
|
|
|
# Cscope/Ctags files
|
|
cscope.*
|
|
tags
|
|
|
|
# IDE stuffs
|
|
nbproject
|