Synchronise with v3.8-rc1

Not much getting in this time... :-/

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

diff --git a/.version b/.version
index be041e7dae23f30752bddbee30a76cb577f45145..6bf21e86c514221408bb640f5ee4992435ce51cb 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-3.7.0 29594404d7fe73cd80eaa4ee8c43dcc53970c60e Terrified Chipmunk
+3.8.0-rc1 a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 Terrified Chipmunk
 hg

diff --git a/scripts/ksync.log b/scripts/ksync.log
index ce4a070ac694f09fe62f9a2cdd20c5bc48154522..421f10b0ff5080c7ed0f1f73d3241addbbcef428 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -20,3 +20,4 @@ menuconfig: Remove superfluous conditionnal
 kconfig: document oldnoconfig to what it really does in conf.c
 kconfig/mconf.c: revision of curses initialization.
 menuconfig: Replace CIRCLEQ by list_head-style lists.
+scripts/config: Fix wrong "shift" for --keep-case

diff --git a/utils/tweak.in b/utils/tweak.in
index 743dc54ca27743acea3e479340d7742e0f603ef3..7734522cc04d41d08683da4ec54223b8db5db8ed 100644 (file)
--- a/utils/tweak.in
+++ b/utils/tweak.in
@@ -101,7 +101,6 @@ while [ "$1" != "" ] ; do
        case "$CMD" in
        --keep-case|-k)
                MUNGE_CASE=no
-               shift
                continue
                ;;
        --refresh)