From: zuul <zuul@gerrit.asterisk.org>
Date: Fri, 22 Jul 2016 12:45:21 +0000 (-0500)
Subject: Merge "res_pjsip: Whitespace and comment cleanup." into 14
X-Git-Tag: 14.0.0-beta1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5356e307dc236e55d8da23bf6f1cd057d72c9fa4;p=thirdparty%2Fasterisk.git

Merge "res_pjsip: Whitespace and comment cleanup." into 14
---

5356e307dc236e55d8da23bf6f1cd057d72c9fa4
diff --cc include/asterisk/res_pjsip.h
index 9dd70dbcaa,594259ba62..9bb2a82c5d
--- a/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@@ -749,12 -749,10 +749,12 @@@ struct ast_sip_endpoint 
  	unsigned int usereqphone;
  	/*! Whether to pass through hold and unhold using re-invites with recvonly and sendrecv */
  	unsigned int moh_passthrough;
- 	/* Access control list */
+ 	/*! Access control list */
  	struct ast_acl_list *acl;
- 	/* Restrict what IPs are allowed in the Contact header (for registration) */
+ 	/*! Restrict what IPs are allowed in the Contact header (for registration) */
  	struct ast_acl_list *contact_acl;
 +	/*! The number of seconds into call to disable fax detection.  (0 = disabled) */
 +	unsigned int faxdetect_timeout;
  };
  
  /*!