summaryrefslogtreecommitdiff
path: root/package/autoconf
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:44:59 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:44:59 +0200
commitb803209ad0f1f198072695109b30a726e0411084 (patch)
tree3d5db865a71f72457d05fbe37cb25e96d67484f8 /package/autoconf
parentfaf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (diff)
fat commit to add support for firefox on ibm x40 via usb stick
- add support for IBM X40 notebook - add USB boot support - add firefox package - update and add all dependencies for firefox - add xorg intel driver - add dri support for xorg
Diffstat (limited to 'package/autoconf')
-rw-r--r--package/autoconf/Makefile6
1 files changed, 0 insertions, 6 deletions
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/