summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUGS5
-rw-r--r--TODO2
-rw-r--r--package/autoconf/Makefile6
3 files changed, 2 insertions, 11 deletions
diff --git a/BUGS b/BUGS
index bbb5275a8..f08dabec5 100644
--- a/BUGS
+++ b/BUGS
@@ -1,8 +1,3 @@
- openssh on amd64 does not work, ssh-keygen endless loop
- uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
-<<<<<<< HEAD
- qemu-mips64* targets does not boot, kernel problem?
-- (cross-)compile from debian amd64 to f.e. qemu-x86_64 or shuttle with
- either glibc or eglibc is broken, have sth. todo with target == host
-=======
->>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a
diff --git a/TODO b/TODO
index 8ab4f4aec..64a9ceca8 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+- php update
+- openssh update
- macos x build
- test on OpenSuSE
- test on Fedora Core
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index b7517b3b3..3e40e7a15 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -4,15 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= autoconf
-<<<<<<< HEAD
-PKG_VERSION:= 2.64
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 30a198cef839471dd4926e92ab485361
-=======
PKG_VERSION:= 2.65
PKG_RELEASE:= 1
PKG_MD5SUM:= 46cfb40e0babf4c64f8325f03da81c9b
->>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a
PKG_DESCR:= GNU autoconf
PKG_SECTION:= utils
PKG_URL:= http://www.gnu.org/software/autoconf/