From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/fltk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/fltk') diff --git a/package/fltk/Makefile b/package/fltk/Makefile index 0adfec2f1..7bae90522 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.2 PKG_RELEASE:= 4 PKG_MD5SUM:= 9f7e707d4fb7a5a76f0f9b73ff70623d PKG_DESCR:= fast light toolkit -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_DEPENDS:= mesalib libx11 libxi freeglut libfreetype PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype PKG_URL:= http://www.fltk.org/ -- cgit v1.2.3