Merge "AST_MODULE_INFO: Format corrections to the usages of AST_MODULE_INFO macro."

author Joshua Colp <jcolp@digium.com>

Thu, 14 May 2015 10:03:43 +0000 (05:03 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Thu, 14 May 2015 10:03:43 +0000 (05:03 -0500)
author Joshua Colp <jcolp@digium.com>
Thu, 14 May 2015 10:03:43 +0000 (05:03 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 14 May 2015 10:03:43 +0000 (05:03 -0500)
diff --cc addons/res_config_mysql.c
Simple merge
diff --cc apps/app_voicemail.c
Simple merge
diff --cc res/res_fax_spandsp.c
Simple merge
diff --cc res/res_rtp_asterisk.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Thu, 14 May 2015 10:03:43 +0000 (05:03 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 14 May 2015 10:03:43 +0000 (05:03 -0500)
		1	2
addons/res_config_mysql.c	patch \|	diff1 \|	diff2 \|	blob \| history
apps/app_voicemail.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_fax_spandsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_rtp_asterisk.c	patch \|	diff1 \|	diff2 \|	blob \| history