merge changes from team/murf/AEL-trunk-fixesonly
authorRussell Bryant <russell@russellbryant.com>
Sun, 18 Jun 2006 21:36:24 +0000 (21:36 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sun, 18 Jun 2006 21:36:24 +0000 (21:36 +0000)
commit73ae55698fdc5ffc2a0f0d8c4a499cd9b09dc562
tree8c013c06f433598c8319a154dce0cade99d7145a
parentc229baa0cf759b8ad9b30f931b5916c75efa0231
merge changes from team/murf/AEL-trunk-fixesonly
 - fix callerid matching for extensions
 - fix nested switch statements
 - fix compilation with bison 2.1a or higher
(issue #7309)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
16 files changed:
doc/ael.txt
include/asterisk/ael_structs.h
pbx/ael/ael-test/ael-test8/extensions.ael [new file with mode: 0644]
pbx/ael/ael-test/ref.ael-test1
pbx/ael/ael-test/ref.ael-test2
pbx/ael/ael-test/ref.ael-test3
pbx/ael/ael-test/ref.ael-test4
pbx/ael/ael-test/ref.ael-test5
pbx/ael/ael-test/ref.ael-test6
pbx/ael/ael-test/ref.ael-test7
pbx/ael/ael-test/ref.ael-test8 [new file with mode: 0644]
pbx/ael/ael.tab.c
pbx/ael/ael.tab.h
pbx/ael/ael.y
pbx/ael/ael_lex.c
pbx/pbx_ael.c