Blocked revisions 159571 via svnmerge
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 26 Nov 2008 20:35:14 +0000 (20:35 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 26 Nov 2008 20:35:14 +0000 (20:35 +0000)
commitf62ffebedfc70d7fe40069e14a37e9c0ad2322f9
treeeed75308af979f490c040b6f0f560db5c62d820d
parent5cf09591b06192e6f6a2988a53e9c4bde336e8d0
Blocked revisions 159571 via svnmerge

........
  r159571 | kpfleming | 2008-11-26 14:21:04 -0600 (Wed, 26 Nov 2008) | 2 lines

  rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place
........

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