aboutsummaryrefslogtreecommitdiffstats
path: root/main/cli.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-03 22:18:49 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-03 22:18:49 +0000
commit815b5b09da5e555add7bba3d8fca588e7611248a (patch)
tree5ce5941655fa86d51f1afe49af0498a5951c3b0e /main/cli.c
parent8681461dc1270ace5a4e6b856aa39890b3857729 (diff)
Blocked revisions 280812 via svnmerge
................ r280812 | tilghman | 2010-08-03 15:52:20 -0500 (Tue, 03 Aug 2010) | 16 lines Merged revisions 280811 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r280811 | tilghman | 2010-08-03 15:49:10 -0500 (Tue, 03 Aug 2010) | 9 lines Prevent DAHDI channels from overriding the callerid, once it's been set by the user. (closes issue #16661) Reported by: jstapleton Patches: 20100414__issue16661.diff.txt uploaded by tilghman (license 14) 20100415__issue16661__1.6.2.diff.txt uploaded by tilghman (license 14) Tested by: jstapleton ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@280878 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cli.c')
0 files changed, 0 insertions, 0 deletions