]> sjero.net Git - linphone/commit
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 2 Feb 2010 15:25:52 +0000 (16:25 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 2 Feb 2010 15:25:52 +0000 (16:25 +0100)
commit8ee9e3f3673336208ff0944bc8b876af13a0a8ad
treed772623482f02eaf8e53d04f636f9647eeaa924c
parent2b236a98b907b59e367c1b3d090653b686ad69f6
parent187ad65416d050f427d81293b3ab072d6564a086
Merge branch 'master' into dev_sal

Conflicts:
coreapi/private.h
coreapi/exevents.c