diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-15 00:00:34 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-15 00:00:34 +0000 |
| commit | 560edcd1346f6ecaf7f39c48bb096bcaf039d5a8 (patch) | |
| tree | 9d77b8b9b389258f2d1335663107144715facb74 /utils/Makefile | |
| parent | 99362a5199f1a61a61858bf47befea15b336be96 (diff) | |
Merged revisions 130890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r130890 | tilghman | 2008-07-14 18:59:54 -0500 (Mon, 14 Jul 2008) | 16 lines
Merged revisions 130889 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r130889 | tilghman | 2008-07-14 18:59:13 -0500 (Mon, 14 Jul 2008) | 8 lines
Override the callerid in all cases when the callerid is set in the user, not
just when a remote callerid is set. Also, if not set in the user, allow the
remote CallerID to pass through.
(closes issue #12875)
Reported by: dimas
Patches:
20080714__bug12875.diff.txt uploaded by Corydon76 (license 14)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130891 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils/Makefile')
0 files changed, 0 insertions, 0 deletions