]> sjero.net Git - linphone/commit
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 12 Feb 2010 10:48:08 +0000 (11:48 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 12 Feb 2010 10:48:08 +0000 (11:48 +0100)
commit7a8382929e048c2c4831dab23cdce7a606bc5428
treeb1fd72e8db02f99dbf40c97dba3955bc64ea882a
parent0015964665d0b3865abd48c6e41e592babf3ce55
parent6d52275b03b8acf211ea9f8971db5c14b83b28db
Merge branch 'master' into dev_sal

Conflicts:
coreapi/authentication.c
coreapi/linphonecore.h
coreapi/misc.c
coreapi/proxy.c
coreapi/authentication.c
coreapi/callbacks.c
coreapi/linphonecore.c
coreapi/linphonecore.h
coreapi/misc.c
gtk-glade/logging.c
gtk-glade/loginframe.c