git.openpandora.org
/
openembedded.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
323edc5
84efca2
)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into...
author
Sergey Lapin
<slapin@ossfans.org>
Fri, 26 Jun 2009 18:32:52 +0000
(22:32 +0400)
committer
Sergey Lapin
<slapin@ossfans.org>
Fri, 26 Jun 2009 18:32:52 +0000
(22:32 +0400)
Conflicts:
recipes/musicpd/mpd_0.14.2.bb
1
2
recipes/musicpd/mpd_0.14.2.bb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
recipes/musicpd/mpd_0.14.2.bb
Simple merge