Show conflits on make update (bug #3191)
authorMark Spencer <markster@digium.com>
Wed, 29 Dec 2004 23:52:42 +0000 (23:52 +0000)
committerMark Spencer <markster@digium.com>
Wed, 29 Dec 2004 23:52:42 +0000 (23:52 +0000)
commitcc015174898b9ebed02694588d1497e6f18ad5df
tree0fd84a5f9d7dc57deffc5e6d1d0d7fa5475daddd
parentccead56701655050a18b883e024ae7a74325373e
Show conflits on make update (bug #3191)

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