Fix merge properties to reflect Asterisk 10 branch

Browse Source

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329105 65c4cc65-6c06-0410-ace0-fbb531ad65f3

certified/11.2

Russell Bryant 14 years ago

parent 3a4520214a

commit e6e0fb0d9a

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

Diff Content Not Available