Merged revisions 242969 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 25 Jan 2010 21:51:41 +0000 (21:51 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 25 Jan 2010 21:51:41 +0000 (21:51 +0000)
commit1ffdf5c2ee645e9f79e9dd2d0b34f418048fba81
tree62f2ebe82a7af6754b230ad61b0a0fd8413b86ea
parentbbc47dbac2d8c80496e0a4ddccacc1c42c550899
Merged revisions 242969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines

  Err, and use the new menuselect define, too.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@242971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/Makefile
res/Makefile