Revision
17222
Author
jmesquita
Date
2010-04-05 20:03:58 -0500 (Mon, 05 Apr 2010)

Log Message

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

Modified Paths

Diff

Modified: freeswitch/trunk/.gitignore ( => )



Modified: freeswitch/trunk/libs/.gitignore
===================================================================

Modified: freeswitch/trunk/libs/freetdm/Makefile.am ( => )



Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c
===================================================================

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



Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c
===================================================================

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



Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
===================================================================

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



Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h
===================================================================

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



Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h
===================================================================

Modified: freeswitch/trunk/libs/unimrcp/.gitignore ( => )



Modified: freeswitch/trunk/src/.gitignore
===================================================================

Modified: freeswitch/trunk/src/mod/.gitignore ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_distributor/.gitignore
===================================================================

Modified: freeswitch/trunk/src/mod/applications/mod_snapshot/.gitignore ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_vmd/.gitignore
===================================================================

Modified: freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/.gitignore ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_gsmopen/.gitignore
===================================================================

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_test/.gitignore ( => )