From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Tue, 2 Aug 2016 20:12:49 +0000 (+0200)
Subject: Synchronise with v3.18
X-Git-Tag: v3.18.0.0^0
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ad5d7d3576ffc3ec5331f513931092513e7737a;p=kconfig-frontends

Synchronise with v3.18

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---

diff --git a/.version b/.version
index cfa4ee1..cb7161d 100644
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-3.17.0 bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 Shuffling Zombie Juror
+3.18.0 b2776bf7149bddd1f4161f14f79520f17fc1d71d Diseased Newt
 0
diff --git a/libs/lxdialog/dialog.h b/libs/lxdialog/dialog.h
index b4343d3..fcffd5b 100644
--- a/libs/lxdialog/dialog.h
+++ b/libs/lxdialog/dialog.h
@@ -170,7 +170,7 @@ char item_tag(void);
 /* item list manipulation for lxdialog use */
 #define MAXITEMSTR 200
 struct dialog_item {
-	char str[MAXITEMSTR];	/* promtp displayed */
+	char str[MAXITEMSTR];	/* prompt displayed */
 	char tag;
 	void *data;	/* pointer to menu item - used by menubox+checklist */
 	int selected;	/* Set to 1 by dialog_*() function if selected. */
diff --git a/scripts/ksync.log b/scripts/ksync.log
index 3551f85..ea08e51 100644
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -94,3 +94,4 @@ e062781 kconfig: do not allow more than one symbol to have 'option modules'
 5d2acfc kconfig: make allnoconfig disable options behind EMBEDDED and EXPERT
 7eb6e34 kbuild: trivial - remove trailing empty lines
 bb66fc6 kbuild: trivial - use tabs for code indent where possible
+c40724d kconfig: lxdialog: fix spelling