From: Automerge Script <automerge@asterisk.org>
Date: Sun, 22 Jul 2007 22:29:15 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.23-netsec~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f745b034e9a55265e3c6d3bd61731e2a1e8915f;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@76456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 98a78d2d08..35f0af104d 100644
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -189,7 +189,7 @@ int ast_app_group_match_get_count(char *groupmatch, char *category);
 int ast_app_group_discard(struct ast_channel *chan);
 
 /*! Update all group counting for a channel to a new one */
-int ast_app_group_update(struct ast_channel *old, struct ast_channel *new);
+int ast_app_group_update(struct ast_channel *oldchan, struct ast_channel *newchan);
 
 /*! Lock the group count list */
 int ast_app_group_list_lock(void);