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	kconfig: migrate parser to implicit rules	2011-06-09 14:04:44 -04:00
check.sh	kbuild: check if we can link gettext not just compile	2007-10-12 21:13:50 +02:00
conf.c	kconfig/conf: mark xfgets() private	2011-07-02 01:04:40 -04:00
confdata.c	kconfig: fix new choices being skipped upon config update	2012-01-26 11:01:56 +01:00
expr.c	kconfig: use calloc() for expr allocation	2011-07-02 01:04:37 -04:00
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	scripts/kconfig/gconf.glade Update broken web addresses.	2010-09-17 16:54:42 +02:00
images.c
kxgettext.c	kconfig: nuke LKC_DIRECT_LINK cruft	2011-06-06 15:32:20 -04:00
lkc_proto.h	kconfig: introduce specialized printer	2011-07-01 16:23:27 +02:00
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	kconfig: gettext support for lxdialog	2008-01-28 23:14:39 +01:00
qconf.cc	xconfig: Abort close if configuration cannot be saved	2011-07-25 15:50:34 +02:00
qconf.h	xconfig: Abort close if configuration cannot be saved	2011-07-25 15:50:34 +02:00
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	kconfig: add missing <stdlib.h> inclusion	2011-06-06 15:32:16 -04:00
zconf.gperf	kconfig: constify `kconf_id_lookup'	2011-06-09 14:04:42 -04:00
zconf.hash.c_shipped	kconfig: regen parser	2011-06-09 14:04:45 -04:00
zconf.l	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-07-30 00:17:06 -07:00
zconf.lex.c_shipped	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-07-30 00:17:06 -07:00
zconf.tab.c_shipped	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-07-30 00:17:06 -07:00
zconf.y	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-07-30 00:17:06 -07:00