]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge branch 'master' into smgmaster
authorKonrad Hammel <konrad@sangoma.com>
Fri, 10 Dec 2010 21:59:47 +0000 (16:59 -0500)
committerKonrad Hammel <konrad@sangoma.com>
Fri, 10 Dec 2010 21:59:47 +0000 (16:59 -0500)
commit84abc3021ba1ea70103b9ffd2fe64b2e0fecd63d
treedce3d4e1a766567b3e9216bbfad1bd4ffa4396be
parent2d4b16516ad6ae78cc0d34f105701c75a22d6080
parentff07022c264c4414c5a51299b71429f8da2f37fa
Merge branch 'master' into smgmaster
libs/esl/fs_cli.c
src/include/switch_apr.h
src/mod/applications/mod_commands/mod_commands.c
src/mod/endpoints/mod_sofia/mod_sofia.c
src/mod/endpoints/mod_sofia/mod_sofia.h
src/switch_apr.c