diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-11 16:11:54 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-11 16:11:54 +0000 |
| commit | 01973fe10eb521d768d997b50fb4f9bf8e6c353d (patch) | |
| tree | a6bca597d6480ec99b02872588aed71402f43eb9 /ChangeLog | |
| parent | fec0763fb39ebfdf79d0286d829e0c5305bee36a (diff) | |
Fixing bad merge
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.13@211713 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1,4 +1,10 @@ -2009-08-09 Tilghman Lesher <tlesher@digium.com> +2009-08-11 Tilghman Lesher <tlesher@digium.com> + + * Asterisk 1.6.0.13 released + + * channels/chan_iax2.c: Bad merge from 1.6.0 branch + +2009-08-10 Tilghman Lesher <tlesher@digium.com> * Asterisk 1.6.0.12 released |