John Stultz 55cae3043a merge_config.sh: Set execute bit ... Somehow the merge_config.sh script didn't get its execute bit set when it was merged. Fix this. Signed-off-by: John Stultz <john.stultz@linaro.org> Acked-by: Darren Hart <dvhart@linux.intel.com> Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Michal Marek <mmarek@suse.cz>		2012-03-30 15:10:48 +02:00
..
lxdialog	kconfig: fix set but not used variables	2011-08-29 20:22:26 -04:00
.gitignore
check.sh
conf.c
confdata.c	kconfig: fix new choices being skipped upon config update	2012-01-26 11:01:56 +01:00
expr.c
expr.h	kbuild: Fix compiler warning with assertion when calling 'fwrite'	2012-01-15 00:17:18 +01:00
gconf.c	kconfig: fix set but not used warnings	2011-12-11 21:29:45 +01:00
gconf.glade
images.c
kxgettext.c
lkc_proto.h
lkc.h	kbuild: Fix compiler warning with assertion when calling 'fwrite'	2012-01-15 00:17:18 +01:00
Makefile	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-01-16 14:35:34 -08:00
mconf.c	menuconfig: fix a regression when canceling the prompt dialog at exit	2012-01-16 14:40:16 +01:00
menu.c	kconfig: factor code in menu_get_ext_help()	2011-08-08 16:02:03 +02:00
merge_config.sh	merge_config.sh: Set execute bit	2012-03-30 15:10:48 +02:00
nconf.c	scripts/kconfig/nconf: dynamically alloc dialog_input_result	2011-09-09 14:40:08 +02:00
nconf.gui.c	scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputbox	2011-09-09 14:40:08 +02:00
nconf.h	scripts/kconfig/nconf: dynamically alloc dialog_input_result	2011-09-09 14:40:08 +02:00
POTFILES.in
qconf.cc
qconf.h
streamline_config.pl	kconfig/streamline-config.pl: Fix parsing Makefile with variables	2012-01-13 18:01:48 -05:00
symbol.c	kconfig: fix new choices being skipped upon config update	2012-01-26 11:01:56 +01:00
util.c
zconf.gperf
zconf.hash.c_shipped
zconf.l
zconf.lex.c_shipped
zconf.tab.c_shipped
zconf.y