summaryrefslogtreecommitdiff
path: root/main/indications.c
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-04-19 19:23:41 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-04-19 19:23:41 +0000
commit990ccdd05f17eb845fdd255568d44eac3833bf14 (patch)
tree78beef8974ef73a31629ad9f651a1440cd3a19f1 /main/indications.c
parent38d77bde7579e8df90ea21aa6df503c9b329dd32 (diff)
Bad merge fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@257883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/indications.c')
0 files changed, 0 insertions, 0 deletions