[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ unstable
git version control
git at git.openembedded.org
Wed Feb 24 19:20:48 UTC 2010
Module: openembedded.git
Branch: shr/unstable
Commit: 34b20acac30c79acd72ac4d562b53d0845362104
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=34b20acac30c79acd72ac4d562b53d0845362104
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Wed Feb 24 20:20:11 2010 +0100
Merge remote branch 'origin/org.openembedded.dev' into shr/unstable
Conflicts:
recipes/gpe-icons/gpe-theme-neo_git.bb
recipes/shr/e-wm-theme-illume-neo_git.bb
recipes/shr/elementary-theme-neo_git.bb
recipes/shr/etk-theme-neo_git.bb
recipes/shr/gtk-theme-neo_git.bb
recipes/shr/icon-theme-neo_git.bb
recipes/shr/phoneui-shr-theme-neo_git.bb
---
More information about the Openembedded-commits
mailing list