diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-23 23:34:57 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-23 23:34:57 +0000 |
| commit | 884a5b3d8283eddcef3176b900dffa3baaf5a83f (patch) | |
| tree | 374dea5f354d53a79d902fb7e9e4594784a51b6f | |
| parent | 17f074ba5ed8890ce90ca1e772cd46db4a9372fe (diff) | |
Blocked revisions 144149 via svnmerge
........
r144149 | mmichelson | 2008-09-23 18:33:33 -0500 (Tue, 23 Sep 2008) | 3 lines
Fix a conflict in flag values
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@144150 f38db490-d61c-443f-a65b-d21fe96a405b
0 files changed, 0 insertions, 0 deletions