summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2020-09-21 15:08:56 -0700
committerThomas Groman <tgroman@nuegia.net>2020-09-21 15:08:56 -0700
commit4aa31001bae125293466d582c2ed1dca441c1103 (patch)
tree5a2bdfc6d6b0ea1f94c53e7c7108d7108940f8c5 /NEWS
parenteffdcc9b1cf185f24e67d9e627a77d823bcfef8f (diff)
parentb7965d023cb68bce6d9495eb6afbc73206c1afef (diff)
downloadtwinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar
twinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar.gz
twinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar.lz
twinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar.xz
twinkle-4aa31001bae125293466d582c2ed1dca441c1103.zip
Merge branch 'master' into jackaudiojackaudio
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 0ced74e..1b27196 100644
--- a/NEWS
+++ b/NEWS
@@ -267,8 +267,8 @@ Other
=================
- Local address book
- Message waiting indication (MWI)
- * Sollicted MWI as specified by RFC 3842
- * Unsollicited MWI as implemented by Asterisk
+ * Solicited MWI as specified by RFC 3842
+ * Unsolicited MWI as implemented by Asterisk
- Voice mail speed dial
- Call transfer with consultation
* This is a combination of a consultation call on the other line