be more careful when merging in a branch with automerge properties :-(

Browse Source

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

...

This commit is contained in:

Kevin P. Fleming

2006-03-30 14:19:25 +00:00

parent 03ce34e1aa

commit 4ee62f1bcd

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

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

Diff Content Not Available