Merged revisions 299449 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 22 Dec 2010 20:10:34 +0000 (20:10 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 22 Dec 2010 20:10:34 +0000 (20:10 +0000)
commit8cca4ed8d859659ef68f6cf2500a1f725008d892
tree43c595a3de6094023b27105bbb7a2d6eab0b9707
parent17d2c0f78765b0b5639c4627c21be9598382f3fb
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
pbx/ael/ael-test/ref.ael-test19
pbx/ael/ael-test/ref.ael-test3
pbx/ael/ael-test/ref.ael-vtest13
pbx/ael/ael-test/ref.ael-vtest17
pbx/ael/ael-test/ref.ael-vtest25
res/ael/pval.c