[oe-commits] Sebastian Spaeth : fsogsmd: fix merge conflict

git version control git at git.openembedded.org
Fri Nov 13 06:54:16 UTC 2009


Module: openembedded.git
Branch: shr/merge
Commit: 9f68ca5a6628bacff10e65a4f601c5a7cf82ebbd
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9f68ca5a6628bacff10e65a4f601c5a7cf82ebbd

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Nov 13 07:53:28 2009 +0100

fsogsmd: fix merge conflict

Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

---







More information about the Openembedded-commits mailing list