Merged revisions 7740 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 3 Jan 2006 17:25:39 +0000 (17:25 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 3 Jan 2006 17:25:39 +0000 (17:25 +0000)
commitcdf030346592cf7a2c366e169f7764537dfe52b6
tree6f75f0731b334b7d0960a3c8d4975a97421bf178
parent815d2413ff319560d6786398a3ea08e629efe389
Merged revisions 7740 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7740 | kpfleming | 2006-01-03 11:24:56 -0600 (Tue, 03 Jan 2006) | 4 lines

revert incorrect fix for bug #6048 from revision 7709
put in correct (simpler) fix
add doxygen docs for channel spy 'state' values

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_chanspy.c
apps/app_mixmonitor.c
channel.c
include/asterisk/chanspy.h