From 09d16b0d3539d50541425097e88b54a7a47ac1a9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 2 May 2017 20:09:23 +0200 Subject: [PATCH] Synchronise with 4.11 Signed-off-by: "Yann E. MORIN" --- .version | 2 +- frontends/gconf/gconf.c | 2 +- scripts/ksync.log | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 8498a07..9846f0a 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -4.10.0 c470abd4fde40ea6a0846a2beab642a578c0b8cd Fearless Coyote +4.11.0 a351e9b9fc24e982ec2f0e76379a49826036da12 Fearless Coyote 0 diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c index a932034..dca17e1 100644 --- a/frontends/gconf/gconf.c +++ b/frontends/gconf/gconf.c @@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget, current = menu; display_tree_part(); gtk_widget_set_sensitive(back_btn, TRUE); - } else if ((col == COL_OPTION)) { + } else if (col == COL_OPTION) { toggle_sym_value(menu); gtk_tree_view_expand_row(view, path, TRUE); } diff --git a/scripts/ksync.log b/scripts/ksync.log index c851058..7acb27c 100644 --- a/scripts/ksync.log +++ b/scripts/ksync.log @@ -170,3 +170,4 @@ cfd7c612 kconfig-language: improve menuconfig usage description 79e51b5 kconfig/nconf: Fix hang when editing symbol with a long prompt e039303 xconfig: fix 'Show Debug' functionality 83c3a1b xconfig: fix missing suboption and help panels on first run +9be3213 gconfig: remove misleading parentheses around a condition -- 2.39.2