git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61d9294 e13eb6e)
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
authorHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 00:09:51 +0000 (01:09 +0100)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 00:09:51 +0000 (01:09 +0100)
Conflicts:

packages/tasks/task-openmoko-feed.bb

1  2 
packages/tasks/task-openmoko-feed.bb patch | diff1 | diff2 | blob | history

diff --cc packages/tasks/task-openmoko-feed.bb
index 9781d7b,c50b423..ab11f61
--- 1/packages/tasks/task-openmoko-feed.bb
--- 2/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@@ -1,7 -1,7 +1,7 @@@
  DESCRIPTION = "Openmoko: Misc. Feed Items"
  SECTION = "openmoko/base"
  LICENSE = "MIT"
- PR = "r47"
 -PR = "r53"
++PR = "r54"
  
  inherit task
  
Clone of mainline OpenEmbedded repository