Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/freeradius-server/Makefile
	package/nss/patches/patch-mozilla_security_coreconf_Linux_mk

1 files changed, 0 insertions, 22 deletions

diff --git a/package/xf86-video-intel/patches/patch-configure.orig b/package/xf86-video-intel/patches/patch-configure.orig
deleted file mode 100644
index fc077ce34..000000000
--- a/package/xf86-video-intel/patches/patch-configure.orig
+++ /dev/null
@@ -1,22 +0,0 @@
---- xf86-video-intel-2.9.1.orig/configure	2009-10-26 12:53:35.000000000 +0100
-+++ xf86-video-intel-2.9.1/configure	2010-04-21 19:57:01.000000000 +0200
-@@ -12283,9 +12283,6 @@ if test x$DRI != xno; then
- $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
--else
--  test "$cross_compiling" = yes &&
--  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
- if test -r "${sdkdir}/dri.h"; then
-   eval "$as_ac_File=yes"
- else
-@@ -12331,9 +12328,6 @@ fi
- $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
--else
--  test "$cross_compiling" = yes &&
--  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
- if test -r "${sdkdir}/dristruct.h"; then
-   eval "$as_ac_File=yes"
- else