diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-03 20:05:56 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-03 20:05:56 +0000 |
commit | b16915f874bc564f95dd90dc9693543d429c6eda (patch) | |
tree | 97bbdd48a314c46ba289e93cc83c2934e967ae3b /channels/chan_dahdi.c | |
parent | 86c802db723291292c19c436ce80c2a4ffa1415b (diff) |
Merged revisions 186444,186447 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r186444 | tilghman | 2009-04-03 14:30:34 -0500 (Fri, 03 Apr 2009) | 14 lines
Merged revisions 186415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r186415 | tilghman | 2009-04-03 14:06:58 -0500 (Fri, 03 Apr 2009) | 7 lines
Distinguish in a sent email between simple sends and forwards.
(closes issue #11678)
Reported by: jamessan
Patches:
20090330__bug11678.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman, lmadsen
........
................
r186447 | tilghman | 2009-04-03 14:59:55 -0500 (Fri, 03 Apr 2009) | 9 lines
Merged revisions 186445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r186445 | tilghman | 2009-04-03 14:56:48 -0500 (Fri, 03 Apr 2009) | 2 lines
Found a conflict in the last commit, due to multiple targets
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@186449 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
0 files changed, 0 insertions, 0 deletions