From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 4 Sep 2007 07:53:07 +0000 (+0000)
Subject: merge of 'db3553a557f70630b0299ead528cf8868b9d65fe'
X-Git-Tag: Release-2010-05/1~8718^2~20^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abf18fdd06972bcf2bdc9469499fb0dd6c1d2650;p=openembedded.git

Merge ... 'db3553a557f70630b0299ead528cf8868b9d65fe'
     and 'febd6fbea9748c083f400f53d4ed18480207fd5a'
---

abf18fdd06972bcf2bdc9469499fb0dd6c1d2650
diff --cc packages/scummvm/scummvm.inc
index 127754ffb8,509caeab64..b35e71374d
--- a/packages/scummvm/scummvm.inc
+++ b/packages/scummvm/scummvm.inc
@@@ -3,7 -3,7 +3,7 @@@ HOMEPAGE = "http://www.scummvm.org
  SECTION = "games"
  PRIORITY = "optional"
  LICENSE = "GPL"
- PR = "r3"
 -PR = "r2"
++PR = "r4"
  
  SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"