aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-11 17:47:56 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-11 17:47:56 +0000
commitd04532dfa8bb2d5a8648677f0a608921de587088 (patch)
tree3fa22f000bd009d8cc090532204453137c4179a0
parent01973fe10eb521d768d997b50fb4f9bf8e6c353d (diff)
SIP, not IAX2
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.13@211714 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 74bfcb5a0..d55e865d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
* Asterisk 1.6.0.13 released
- * channels/chan_iax2.c: Bad merge from 1.6.0 branch
+ * channels/chan_sip.c: Bad merge from 1.6.0 branch
2009-08-10 Tilghman Lesher <tlesher@digium.com>