diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-08-23 22:40:57 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-08-23 22:40:57 +0000 |
| commit | 062290bde0691db4a071556db039fee5744e9982 (patch) | |
| tree | ccd292d989a4eaba825e398ec605bf850c4e6ecd /include/asterisk | |
| parent | 9c713d12dab7f6fc1e3ccd80ac3f4541f9069a2e (diff) | |
Set new merge properties on 12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
0 files changed, 0 insertions, 0 deletions