]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Found a conflict in the last commit, due to multiple targets
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 3 Apr 2009 19:56:48 +0000 (19:56 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 3 Apr 2009 19:56:48 +0000 (19:56 +0000)
commit3d9585f4ba62d636eaac00b59c78c34adbc5e5bd
treec9440f88dfc6eb0cbc4aaa88fefef883ce205d46
parent6d08bad53818c4c427834666fa9c13d83dc83c6f
Found a conflict in the last commit, due to multiple targets

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@186445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_voicemail.c