From 22e24d73762b2cfc79797f94d9e2d9e3f070c418 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Nov 2013 13:51:33 +0100 Subject: resolve merge conflict --- package/oprofile/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/oprofile') diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index e7ed35b74..e2f5edca9 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile -PKG_VERSION:= 0.9.8 +PKG_VERSION:= 0.9.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6d127023af1dd1cf24e15411229f3cc8 +PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx -- cgit v1.2.3