feature/android 5a7855e84ab 05/10: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit 5a7855e84abd56e55b456aef4a43ae7623e76899
Merge: 19eb27d4778 ac2c7a28da0
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 src/textconv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/textconv.c b/src/textconv.c
index e91e127b71c..d5db6d11717 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -279,6 +279,7 @@ textconv_query (struct frame *f, struct 
textconv_callback_struct *query)
        }
 
     default:
+      break;
     }
 
   /* Undo any changes to the excursion.  */