]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)
commit456773d9dc4287a1e36159ba1b81c3bb5d943b12
tree9fbe14410f613eab949ab467a4e6d27af413319d
parent9848aa594d9434f66ef7da14004239f874b79a08
parent6757edcdeedfd57545e66a3e373d51f5e21c2823
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
coreapi/linphonecore.h
coreapi/callbacks.c
coreapi/private.h