]> sjero.net Git - linphone/commit
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 12 Feb 2010 17:15:19 +0000 (18:15 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 12 Feb 2010 17:15:19 +0000 (18:15 +0100)
commit4e721e8a4f6c5aa36442cebbf631a36213a4a0e5
tree06c6ddc304e22d30da01836b3019b620aace051d
parent7a8382929e048c2c4831dab23cdce7a606bc5428
parent01cd17d3c6798af285180aec762761aec2b969a8
Merge branch 'master' into dev_sal

Conflicts:
console/commands.c
console/commands.c
console/linphonec.c
coreapi/linphonecore.h
gtk-glade/logging.c