Merge branch 'master' into dev_sal

2026-05-07 05:53:06 +00:00 · 2010-01-20 17:08:28 +01:00 · 2010-01-20 17:08:28 +01:00 · 1be210a995
commit 1be210a995
parent 2848c5617c 0bf2fb0ecd
1340 changed files with 8 additions and 275104 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,6 @@
+[submodule "oRTP"]
+	path = oRTP
+	url = git://git.linphone.org/ortp.git
+[submodule "mediastreamer2"]
+	path = mediastreamer2
+	url = git://git.linphone.org/mediastreamer2.git
--- a/linphone/ABOUT-NLS
+++ b/linphone/ABOUT-NLS
--- a/linphone/AUTHORS
+++ b/linphone/AUTHORS
--- a/linphone/BUGS
+++ b/linphone/BUGS
--- a/linphone/COPYING
+++ b/linphone/COPYING
--- a/linphone/ChangeLog
+++ b/linphone/ChangeLog
--- a/linphone/Makefile.am
+++ b/linphone/Makefile.am
--- a/linphone/NEWS
+++ b/linphone/NEWS
--- a/linphone/README
+++ b/linphone/README
--- a/linphone/README.M68k.txt
+++ b/linphone/README.M68k.txt
--- a/linphone/README.arm
+++ b/linphone/README.arm
--- a/linphone/README.macos
+++ b/linphone/README.macos
--- a/linphone/README.mingw
+++ b/linphone/README.mingw
--- a/linphone/TODO
+++ b/linphone/TODO
--- a/linphone/autogen.sh
+++ b/linphone/autogen.sh
--- a/linphone/build/wince/liblinphone.sln
+++ b/linphone/build/wince/liblinphone.sln
--- a/linphone/build/wince/liblinphone.vcproj
+++ b/linphone/build/wince/liblinphone.vcproj
--- a/linphone/build/wince/linphonec/linphonec.vcproj
+++ b/linphone/build/wince/linphonec/linphonec.vcproj
--- a/linphone/config.rpath
+++ b/linphone/config.rpath
--- a/linphone/configure.in
+++ b/linphone/configure.in
--- a/linphone/console/.gitignore
+++ b/linphone/console/.gitignore
--- a/linphone/console/Makefile.am
+++ b/linphone/console/Makefile.am
--- a/linphone/console/TODO
+++ b/linphone/console/TODO
--- a/linphone/console/commands.c
+++ b/linphone/console/commands.c
--- a/linphone/console/example/linphonec
+++ b/linphone/console/example/linphonec
--- a/linphone/console/linphonec.c
+++ b/linphone/console/linphonec.c
--- a/linphone/console/linphonec.h
+++ b/linphone/console/linphonec.h
--- a/linphone/console/shell.c
+++ b/linphone/console/shell.c
--- a/linphone/console/sipomatic.c
+++ b/linphone/console/sipomatic.c
--- a/linphone/console/sipomatic.h
+++ b/linphone/console/sipomatic.h
--- a/linphone/console/wav2raw.c
+++ b/linphone/console/wav2raw.c
--- a/linphone/coreapi/.gitignore
+++ b/linphone/coreapi/.gitignore
--- a/linphone/coreapi/Makefile.am
+++ b/linphone/coreapi/Makefile.am
--- a/linphone/coreapi/address.c
+++ b/linphone/coreapi/address.c
--- a/linphone/coreapi/authentication.c
+++ b/linphone/coreapi/authentication.c
--- a/linphone/coreapi/chat.c
+++ b/linphone/coreapi/chat.c
--- a/linphone/coreapi/enum.c
+++ b/linphone/coreapi/enum.c
--- a/linphone/coreapi/enum.h
+++ b/linphone/coreapi/enum.h
--- a/linphone/coreapi/exevents.c
+++ b/linphone/coreapi/exevents.c
--- a/linphone/coreapi/exevents.h
+++ b/linphone/coreapi/exevents.h
--- a/linphone/coreapi/fonis.c
+++ b/linphone/coreapi/fonis.c
--- a/linphone/coreapi/friend.c
+++ b/linphone/coreapi/friend.c
--- a/linphone/coreapi/general_state.c
+++ b/linphone/coreapi/general_state.c
--- a/linphone/coreapi/help/Doxyfile.in
+++ b/linphone/coreapi/help/Doxyfile.in
--- a/linphone/coreapi/help/Makefile.am
+++ b/linphone/coreapi/help/Makefile.am
--- a/linphone/coreapi/help/doxygen.dox.in
+++ b/linphone/coreapi/help/doxygen.dox.in
--- a/linphone/coreapi/linphonecore.c
+++ b/linphone/coreapi/linphonecore.c
--- a/linphone/coreapi/linphonecore.h
+++ b/linphone/coreapi/linphonecore.h
--- a/linphone/coreapi/lpconfig.c
+++ b/linphone/coreapi/lpconfig.c
--- a/linphone/coreapi/lpconfig.h
+++ b/linphone/coreapi/lpconfig.h
--- a/linphone/coreapi/misc.c
+++ b/linphone/coreapi/misc.c
--- a/linphone/coreapi/plugins/buddylookup/AUTHORS
+++ b/linphone/coreapi/plugins/buddylookup/AUTHORS
--- a/linphone/coreapi/plugins/buddylookup/COPYING
+++ b/linphone/coreapi/plugins/buddylookup/COPYING
--- a/linphone/coreapi/plugins/buddylookup/ChangeLog
+++ b/linphone/coreapi/plugins/buddylookup/ChangeLog
--- a/linphone/coreapi/plugins/buddylookup/INSTALL
+++ b/linphone/coreapi/plugins/buddylookup/INSTALL
--- a/linphone/coreapi/plugins/buddylookup/Makefile.am
+++ b/linphone/coreapi/plugins/buddylookup/Makefile.am
--- a/linphone/coreapi/plugins/buddylookup/NEWS
+++ b/linphone/coreapi/plugins/buddylookup/NEWS
--- a/linphone/coreapi/plugins/buddylookup/README
+++ b/linphone/coreapi/plugins/buddylookup/README
--- a/linphone/coreapi/plugins/buddylookup/autogen.sh
+++ b/linphone/coreapi/plugins/buddylookup/autogen.sh
--- a/linphone/coreapi/plugins/buddylookup/configure.ac
+++ b/linphone/coreapi/plugins/buddylookup/configure.ac
--- a/linphone/coreapi/plugins/buddylookup/src/Makefile.am
+++ b/linphone/coreapi/plugins/buddylookup/src/Makefile.am
--- a/linphone/coreapi/plugins/buddylookup/src/lookup.c
+++ b/linphone/coreapi/plugins/buddylookup/src/lookup.c
--- a/linphone/coreapi/presence.c
+++ b/linphone/coreapi/presence.c
--- a/linphone/coreapi/private.h
+++ b/linphone/coreapi/private.h
--- a/linphone/coreapi/proxy.c
+++ b/linphone/coreapi/proxy.c
--- a/linphone/coreapi/sdphandler.c
+++ b/linphone/coreapi/sdphandler.c
--- a/linphone/coreapi/sdphandler.h
+++ b/linphone/coreapi/sdphandler.h
--- a/linphone/coreapi/siplogin.c
+++ b/linphone/coreapi/siplogin.c
--- a/linphone/coreapi/sipsetup.c
+++ b/linphone/coreapi/sipsetup.c
--- a/linphone/coreapi/sipsetup.h
+++ b/linphone/coreapi/sipsetup.h
--- a/linphone/gen-gtkfilelist.sh
+++ b/linphone/gen-gtkfilelist.sh
--- a/linphone/gtk+-2.16.2.filelist
+++ b/linphone/gtk+-2.16.2.filelist
--- a/linphone/gtk+-2.16.6.filelist
+++ b/linphone/gtk+-2.16.6.filelist
--- a/linphone/gtk+-2.18.5.filelist
+++ b/linphone/gtk+-2.18.5.filelist
--- a/linphone/gtk-glade/.gitignore
+++ b/linphone/gtk-glade/.gitignore
--- a/linphone/gtk-glade/Makefile.am
+++ b/linphone/gtk-glade/Makefile.am
--- a/linphone/gtk-glade/about.glade
+++ b/linphone/gtk-glade/about.glade
--- a/linphone/gtk-glade/buddylookup.c
+++ b/linphone/gtk-glade/buddylookup.c
--- a/linphone/gtk-glade/buddylookup.glade
+++ b/linphone/gtk-glade/buddylookup.glade
--- a/linphone/gtk-glade/call_logs.glade
+++ b/linphone/gtk-glade/call_logs.glade
--- a/linphone/gtk-glade/calllogs.c
+++ b/linphone/gtk-glade/calllogs.c
--- a/linphone/gtk-glade/chat.c
+++ b/linphone/gtk-glade/chat.c
--- a/linphone/gtk-glade/chatroom.glade
+++ b/linphone/gtk-glade/chatroom.glade
--- a/linphone/gtk-glade/contact.glade
+++ b/linphone/gtk-glade/contact.glade
--- a/linphone/gtk-glade/fonis.c
+++ b/linphone/gtk-glade/fonis.c
--- a/linphone/gtk-glade/friendlist.c
+++ b/linphone/gtk-glade/friendlist.c
--- a/linphone/gtk-glade/gtkrc
+++ b/linphone/gtk-glade/gtkrc
--- a/linphone/gtk-glade/incall_view.c
+++ b/linphone/gtk-glade/incall_view.c
--- a/linphone/gtk-glade/incoming_call.glade
+++ b/linphone/gtk-glade/incoming_call.glade
--- a/linphone/gtk-glade/linphone.h
+++ b/linphone/gtk-glade/linphone.h
--- a/linphone/gtk-glade/linphone.ico
+++ b/linphone/gtk-glade/linphone.ico
--- a/linphone/gtk-glade/linphone.iss
+++ b/linphone/gtk-glade/linphone.iss
--- a/linphone/gtk-glade/linphone.png
+++ b/linphone/gtk-glade/linphone.png
--- a/linphone/gtk-glade/linphone.rc
+++ b/linphone/gtk-glade/linphone.rc
--- a/linphone/gtk-glade/linphone2.png
+++ b/linphone/gtk-glade/linphone2.png
--- a/linphone/gtk-glade/log.glade
+++ b/linphone/gtk-glade/log.glade
--- a/linphone/gtk-glade/logging.c
+++ b/linphone/gtk-glade/logging.c
--- a/linphone/gtk-glade/loginframe.c
+++ b/linphone/gtk-glade/loginframe.c
--- a/linphone/gtk-glade/main.c
+++ b/linphone/gtk-glade/main.c
--- a/linphone/gtk-glade/main.glade
+++ b/linphone/gtk-glade/main.glade
--- a/Show more
+++ b/Show more