diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-09 23:14:57 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-09 23:14:57 +0000 |
| commit | 2f31b9c50fc0e7d331f381916121d1c58f1e79f0 (patch) | |
| tree | ecaf11c417e7f60e2cb22f271283b1fc4d229ba5 /Makefile | |
| parent | 096e5c0a0f57ece94c482fe617877cd8564502f0 (diff) | |
Missed change from trunk -r168192 when resolving conflicts.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168268 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions