summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2011-07-21 20:26:44 +0000
committerRussell Bryant <russell@russellbryant.com>2011-07-21 20:26:44 +0000
commitf243d129c960ef6ffbf17a7eba0995c5b72c3407 (patch)
tree55a526cafd0665f14ae12a587ccc2466238a6265 /include
parent54f92a68c78def1c6c2694f05a7cfd13f00118df (diff)
Merged revisions 329257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r329257 | russell | 2011-07-21 15:22:36 -0500 (Thu, 21 Jul 2011) | 2 lines s/1.10/10.0/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/netsock2.h2
-rw-r--r--include/asterisk/rtp_engine.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/netsock2.h b/include/asterisk/netsock2.h
index afb1ea90f..83af23a97 100644
--- a/include/asterisk/netsock2.h
+++ b/include/asterisk/netsock2.h
@@ -453,7 +453,7 @@ int ast_sockaddr_is_ipv4(const struct ast_sockaddr *addr);
int ast_sockaddr_is_ipv4_mapped(const struct ast_sockaddr *addr);
/*!
- * \since 1.10
+ * \since 10.0
*
* \brief
* Determine if an IPv4 address is a multicast address
diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h
index 30270ec4a..7e27f5a82 100644
--- a/include/asterisk/rtp_engine.h
+++ b/include/asterisk/rtp_engine.h
@@ -1061,7 +1061,7 @@ struct ast_rtp_payload_type ast_rtp_codecs_payload_lookup(struct ast_rtp_codecs
* \retval pointer to format structure on success
* \retval NULL on failure
*
- * \since 1.10
+ * \since 10.0
*/
struct ast_format *ast_rtp_codecs_get_payload_format(struct ast_rtp_codecs *codecs, int payload);