Revision
17280
Author
moy
Date
2010-04-12 15:11:09 -0500 (Mon, 12 Apr 2010)

Log Message

Merge branch 'master' of git.freeswitch.org:freeswitch

Modified Paths

Diff

Modified: freeswitch/trunk/conf/dialplan/default.xml ( => )



Modified: freeswitch/trunk/docs/phrase/phrase_en.xml
===================================================================

Modified: freeswitch/trunk/libs/freetdm/src/ftdm_cpu_monitor.c ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
===================================================================

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c
===================================================================