[oe-commits] Martin Jansa : Merge remote branch 'origin/martin_jansa/xorg-7.5' into shr/ merge
git version control
git at git.openembedded.org
Fri Dec 4 10:32:54 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: 8a53bab94e3b7ae46514e78713983f332c33de6c
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8a53bab94e3b7ae46514e78713983f332c33de6c
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Fri Dec 4 11:26:54 2009 +0100
Merge remote branch 'origin/martin_jansa/xorg-7.5' into shr/merge
Conflicts:
recipes/u-boot/u-boot-omap3pandora_git.bb
recipes/x-load/x-load-omap3pandora_git.bb
---
More information about the Openembedded-commits
mailing list