Moises Silva 7bd2d154d6 Merge branch 'smgmaster' into releases.3.4.experimental_head ...

Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
	src/mod/endpoints/mod_sofia/mod_sofia.c
	src/mod/endpoints/mod_sofia/sofia_glue.c

2011-12-17 17:42:34 -05:00

..

include

Merge branch 'master' into smgmaster

2011-12-17 17:25:36 -05:00

mod

Merge branch 'master' into smgmaster

2011-12-17 17:25:36 -05:00

.gitignore

…

CMakeLists.txt

…

fs_encode.c

…

g711.c

…

inet_pton.c

…

Makefile.am

…

switch_apr.c

Merge branch 'master' into smgmaster

2011-12-17 17:25:36 -05:00

switch_buffer.c

…

switch_caller.c

…

switch_channel.c

FS-3321 --resolve

2011-12-15 12:16:41 -05:00

switch_config.c

…

switch_console.c

…

switch_core_asr.c

…

switch_core_codec.c

…

switch_core_db.c

…

switch_core_directory.c

…

switch_core_event_hook.c

…

switch_core_file.c

…

switch_core_hash.c

FS-3709 --resolve

2011-11-21 09:53:27 -06:00

switch_core_io.c

use the non-signal checking version of switch_channel_up/down in the core

2011-11-18 13:18:04 -06:00

switch_core_media_bug.c

FS-3069 --resolve

2011-12-14 21:19:15 -05:00

switch_core_memory.c

…

switch_core_port_allocator.c

…

switch_core_rwlock.c

use the non-signal checking version of switch_channel_up/down in the core

2011-11-18 13:18:04 -06:00

switch_core_session.c

FS-3764 --resolve

2011-12-14 13:23:54 -06:00

switch_core_speech.c

…

switch_core_sqldb.c

add missing var set for transfer_source

2011-12-12 10:45:17 -06:00

switch_core_state_machine.c

…

switch_core_timer.c

…

switch_core.c

Merge branch 'master' into smgmaster

2011-12-17 17:25:36 -05:00

switch_cpp.cpp

FS-3553 --resolve

2011-11-16 16:00:14 -06:00

switch_curl.c

FS-2936 stage 5 handle varargs right

2011-11-29 18:17:42 -06:00

switch_dso.c

…

switch_event.c

swap rwlock and mutex

2011-11-28 08:27:46 -06:00

switch_ivr_async.c

FS-3069 --resolve

2011-12-14 21:19:15 -05:00

switch_ivr_bridge.c

put transfer_source in a variable too

2011-12-08 17:33:31 -06:00

switch_ivr_menu.c

…

switch_ivr_originate.c

FS-3765 --resolve

2011-12-16 14:08:26 -05:00

switch_ivr_play_say.c

…

switch_ivr_say.c

say years like 1985 as nineteen-85

2011-11-15 09:51:46 -06:00

switch_ivr.c

put transfer_source in a variable too

2011-12-08 17:33:31 -06:00

switch_json.c

…

switch_limit.c

…

switch_loadable_module.c

Merge branch 'master' into smgmaster

2011-12-17 17:25:36 -05:00

switch_log.c

…

switch_mprintf.c

…

switch_nat.c

FS-2360 --resolve

2011-12-15 14:02:07 -05:00

switch_odbc.c

…

switch_pcm.c

…

switch_profile.c

…

switch_regex.c

…

switch_resample.c

…

switch_rtp.c

FS-2008 fix this patch to not consume memory getting variables

2011-12-16 09:16:37 -06:00

switch_scheduler.c

…

switch_stun.c

…

switch_swig.c

…

switch_swig.i

…

switch_time.c

FS-3709 --resolve

2011-11-21 09:53:27 -06:00

switch_utils.c

FS-3753 --resolve

2011-12-11 22:15:55 -06:00

switch_xml_config.c

…

switch_xml.c

FS-3766 --resolve

2011-12-16 07:35:05 -05:00

switch.c

Merge branch 'smgmaster' into releases.3.4.experimental_head

2011-12-17 17:42:34 -05:00

tone2wav.c

…