MERGE: Clean up some merge mess when pulling in 'org.openembeded.dev'.
authorDavid-John Willis <John.Willis@Distant-earth.com>
Tue, 22 Feb 2011 13:03:59 +0000 (13:03 +0000)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Mon, 4 Apr 2011 19:15:47 +0000 (20:15 +0100)
commit54bdea802c9103938850283e96f4193bcc6815ce
treedfa58d94b8a805a92551878637ddbec409a21214
parentd1ccce10f20c21ff2faa5c3d01e3a66efbe38c59
MERGE: Clean up some merge mess when pulling in 'org.openembeded.dev'.
conf/machine/omap3-pandora.conf
recipes/alsa/alsa-state/omap3-pandora/asound.state [deleted file]
recipes/aufs/aufs2-27_git.bb [deleted file]
recipes/aufs/files/rc.aufs2 [deleted file]
recipes/bluez/bluez4_4.62.bb [deleted file]
recipes/smpeg/smpeg_svn.bb