Anthony Minessale 5ba089e11f FS-5461 --resolve you tricked me I said make 1 patch with all of it ...

Conflicts:
	src/mod/applications/mod_conference/mod_conference.c

2014-03-01 00:28:40 +05:00

..

include

FS-6289 --resolve regression from 1fba654845c8202bf84c58b203a3bc9624164c4e

2014-02-28 21:43:57 +05:00

mod

FS-5461 --resolve you tricked me I said make 1 patch with all of it

2014-03-01 00:28:40 +05:00

.gitignore

…

CMakeLists.txt

…

fs_encode.c

fix regression from 9074a1245564d19145e4d104f34d7286210bef22

2013-09-19 22:24:56 +08:00

g711.c

…

inet_pton.c

…

Makefile.am

…

switch_apr.c

add polycom support to multicast paging, broadcast all formats at once to support most every popular phone at once

2013-11-22 05:00:26 +05:00

switch_buffer.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_caller.c

FS-5620 --resolve

2013-07-19 21:50:55 -05:00

switch_channel.c

FS-6272 --resolve

2014-02-27 03:26:22 +05:00

switch_config.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_console.c

avoid loop and adding a missing complete

2013-11-18 15:15:40 +08:00

switch_core_asr.c

FS-5583 --resolve

2013-07-19 14:03:11 -05:00

switch_core_codec.c

make exception for g722

2013-10-24 05:04:44 +05:00

switch_core_db.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core_directory.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core_event_hook.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core_file.c

fix windows compiler warnings

2013-09-21 16:22:05 -05:00

switch_core_hash.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core_io.c

allow native recording and transcoding at the same time

2014-01-08 04:12:15 +05:00

switch_core_media_bug.c

punt without return

2013-06-28 09:48:28 -05:00

switch_core_memory.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core_port_allocator.c

FS-5675 --resolve

2014-01-24 00:24:15 +05:00

switch_core_rwlock.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core_session.c

FS-6006 --resolve

2013-11-27 23:44:30 +05:00

switch_core_speech.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core_sqldb.c

add total used count for debug

2013-11-18 15:14:03 +08:00

switch_core_state_machine.c

FS-6235

2014-02-23 05:17:21 +05:00

switch_core_timer.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_core.c

FS-5675 --resolve

2014-01-24 00:24:15 +05:00

switch_cpp.cpp

FS-6061 --resolve

2013-12-23 22:43:21 +05:00

switch_curl.c

…

switch_dso.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_event.c

FS-5036 --resolve

2013-12-13 23:14:21 +05:00

switch_ivr_async.c

revert

2013-10-28 21:16:52 +05:00

switch_ivr_bridge.c

fix race condition where a transferring leg could be hungup on by the bridge partner from the previous bridge because of hangup held leg detection. The leg which was hungup when held doesn't realize the other leg has already moved on from the bridge because it was transferred and is already on its way to connect to the new destination

2014-02-28 07:16:05 +05:00

switch_ivr_menu.c

adding transfer-sound to ivr menu so you can specifiy a sound file to pay when a transfer takes place

2013-07-24 18:40:31 -05:00

switch_ivr_originate.c

add support for originated_legs and originating_leg_uuid on enterprise originate

2014-01-22 22:42:16 +05:00

switch_ivr_play_say.c

some null checks from coverity

2013-12-26 23:57:21 +05:00

switch_ivr_say.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_ivr.c

FS-5934 force_transfer_context not being honored if you happen to do an attended this patch makes perfect sense.

2014-02-27 14:11:16 -06:00

switch_json.c

…

switch_limit.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_loadable_module.c

make exception for g722

2013-10-24 05:04:44 +05:00

switch_log.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_mprintf.c

…

switch_nat.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_odbc.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_pcm.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_pgsql.c

do not treat key exists as error as already doing in other place

2013-11-18 15:14:38 +08:00

switch_profile.c

Minor typo. User is being passed into this fuction as a long pointer, not a long.

2013-05-18 14:30:43 -07:00

switch_regex.c

--resolve FS-5566

2013-07-01 17:06:13 -05:00

switch_resample.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_rtp.c

FS-6195 --resolve

2014-02-06 22:24:59 +05:00

switch_scheduler.c

FS-5994 it looks like its microseconds

2014-02-09 04:24:53 +05:00

switch_stun.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_swig.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_swig.i

…

switch_time.c

FS-6056 --resolve this was already fixed in master

2013-12-20 00:12:08 +05:00

switch_utils.c

FS-6250 fix regression from 7efeabbd88e81ee368de6ced32fed06c8035097b, don't discrimiate against people that have s as the first character in their user names

2014-02-27 02:27:39 +05:00

switch_xml_config.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00

switch_xml.c

FS-6217 --resolve

2014-02-13 06:22:24 +05:00

switch.c

FreeSWITCH will choose the right system defaults for you

2013-09-26 03:46:25 +08:00

tone2wav.c

make noexpandtab explicit in all vim modelines other than xml files

2013-06-25 09:39:37 -05:00