Erased the svnmerge-integrated prop from trunk. Please, in your svnmerge-ings, don't let these props leak into the trunk or branches.

Browse Source

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

...

This commit is contained in:

Steve Murphy

2006-11-20 14:08:04 +00:00

parent 4e47ce525b

commit 0f58d0e1f8

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