diff options
author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
---|---|---|
committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
commit | dd53c790d6c3b19bff547755f804e5f2fccc56ed (patch) | |
tree | 592f015c44735d719e52f57c86533cbf6981ca14 /packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch | |
parent | 6be41f1374dc9bf7f53673273d8b02bfbfe6a02e (diff) | |
parent | b765ebc700bd5b639f70ccf2268284be624f46df (diff) |
Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev
Conflicts:
classes/qt4e.bbclass
packages/bluez/bluez4_4.31.bb
packages/mc/mc_4.6.2.bb
packages/vte/vte.inc
packages/vte/vte_0.16.13.bb
packages/vte/vte_0.16.14.bb
Diffstat (limited to 'packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch')
-rw-r--r-- | packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch deleted file mode 100644 index 3dbc130ddc..0000000000 --- a/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 -+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 -@@ -154,7 +154,7 @@ - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - - if test x"$GCONFTOOL" = xno; then -- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) - fi - - AM_GCONF_SOURCE_2 |