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 98a78d2d0883eeebfd224acc4f71e6ef79170e48..35f0af104d49ac0fb24920037217b7d43171d89d 100644 (file)
--- 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);