diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/pango | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/pango')
| -rw-r--r-- | package/pango/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/pango/Makefile b/package/pango/Makefile index f974c73c5..3d84ecbb7 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pango -PKG_VERSION:= 1.26.1 +PKG_VERSION:= 1.28.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 629f653adfdcfd6e4d89e95f74b8d370 +PKG_MD5SUM:= aa3dee16506275a36c6c9239c9e2dfdd PKG_DESCR:= pango library PKG_SECTION:= libs PKG_URL:= http://www.pango.org -PKG_SITES:= ${MASTER_SITE_GNOME:=/pango/1.26/} +PKG_SITES:= ${MASTER_SITE_GNOME:=/pango/1.28/} ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly |