diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-30 14:19:25 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-30 14:19:25 +0000 |
| commit | 631f986ac7c8e738fd492f6d941d73f00c64fef2 (patch) | |
| tree | e7092725bdc5ef9ca65c6dff1984e877710b625a /indications.c | |
| parent | 5ccd44963802ead9756af246243eb39384eea044 (diff) | |
be more careful when merging in a branch with automerge properties :-(
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@16521 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'indications.c')
0 files changed, 0 insertions, 0 deletions