Merged revisions 61805 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 25 Apr 2007 19:27:42 +0000 (19:27 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 25 Apr 2007 19:27:42 +0000 (19:27 +0000)
commit8b2b3e172b5272901d32e507e6f1e8b1630b7844
treeed6ec8f5e250d0dbcf7b06317f5e74301c1b033c
parentf5d4a16cda0dfd53931deeafa91b5fe1724bc85f
Merged revisions 61805 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61805 | file | 2007-04-25 15:21:54 -0400 (Wed, 25 Apr 2007) | 10 lines

Merged revisions 61804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61804 | file | 2007-04-25 14:52:50 -0400 (Wed, 25 Apr 2007) | 2 lines

Merge rewritten group counting support. No more storing data on the variable list of the channels. That was bad, mmmk? (issue #7497 reported by sabbathbh)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
funcs/func_groupcount.c
include/asterisk/app.h
main/app.c
main/channel.c
main/cli.c