diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-22 20:10:34 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-22 20:10:34 +0000 |
| commit | 8cca4ed8d859659ef68f6cf2500a1f725008d892 (patch) | |
| tree | 43c595a3de6094023b27105bbb7a2d6eab0b9707 /pbx/ael/ael-test/ref.ael-test19 | |
| parent | 17d2c0f78765b0b5639c4627c21be9598382f3fb (diff) | |
Merged revisions 299449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r299449 | tilghman | 2010-12-22 14:05:02 -0600 (Wed, 22 Dec 2010) | 15 lines
Merged revisions 299448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r299448 | tilghman | 2010-12-22 14:03:30 -0600 (Wed, 22 Dec 2010) | 8 lines
Resolve warnings by disambiguating the "s" extension as used by chan_dahdi from the "s" extension as used by the AEL macros.
(closes issue #18480)
Reported by: nivek
Patches:
20101215__issue18480__2.diff.txt uploaded by tilghman (license 14)
Tested by: nivek
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299450 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael/ael-test/ref.ael-test19')
| -rw-r--r-- | pbx/ael/ael-test/ref.ael-test19 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pbx/ael/ael-test/ref.ael-test19 b/pbx/ael/ael-test/ref.ael-test19 index 47db4079e..da1e55b9a 100644 --- a/pbx/ael/ael-test/ref.ael-test19 +++ b/pbx/ael/ael-test/ref.ael-test19 @@ -15,4 +15,4 @@ LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: che LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:516 func: main 13 contexts, 57 extensions, 191 priorities +LOG: lev:4 file:ael2_parse line:516 func: main 13 contexts, 58 extensions, 191 priorities |