[asterisk-commits] mmichelson: trunk r421490 - in /trunk: ./ res/res_pjsip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Aug 19 15:28:56 2014
New Revision: 421490

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421490
Log:
Alter documentation for callerid_privacy to use correct values.
........

Merged revisions 421485 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 421488 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=421490&r1=421489&r2=421490
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Tue Aug 19 15:28:56 2014
@@ -116,12 +116,12 @@
 					<description>
 						<enumlist>
 							<enum name="allowed_not_screened" />
-							<enum name="allowed_passed_screened" />
-							<enum name="allowed_failed_screened" />
+							<enum name="allowed_passed_screen" />
+							<enum name="allowed_failed_screen" />
 							<enum name="allowed" />
 							<enum name="prohib_not_screened" />
-							<enum name="prohib_passed_screened" />
-							<enum name="prohib_failed_screened" />
+							<enum name="prohib_passed_screen" />
+							<enum name="prohib_failed_screen" />
 							<enum name="prohib" />
 							<enum name="unavailable" />
 						</enumlist>