git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[pandora-kernel.git]
/
scripts
/
kconfig
/
qconf.h
diff --git
a/scripts/kconfig/qconf.h
b/scripts/kconfig/qconf.h
index
6fc1c5f
..
b3b5657
100644
(file)
--- a/
scripts/kconfig/qconf.h
+++ b/
scripts/kconfig/qconf.h
@@
-279,7
+279,7
@@
class ConfigSearchWindow : public QDialog {
Q_OBJECT
typedef class QDialog Parent;
public:
- ConfigSearchWindow(
QWidget
* parent, const char *name = 0);
+ ConfigSearchWindow(
ConfigMainWindow
* parent, const char *name = 0);
public slots:
void saveSettings(void);