Fix merge properties to reflect Asterisk 10 branch

Browse Source

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329105 f38db490-d61c-443f-a65b-d21fe96a405b

...

This commit is contained in:

russell 2011-07-21 16:05:33 +00:00

parent 6c19532b04

commit 1e1f6e6192

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available