diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-03-02 18:40:03 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-03-02 18:40:03 +0100 |
| commit | 1c57b57195727420a193b523f01ce87b3a0d10ae (patch) | |
| tree | e46754af534ead1aa881f1511b37c714fd5dcca2 /recipes/shr | |
| parent | 6d3197fae893ba752596050f14d8072f93993a8a (diff) | |
| parent | 0da9a5aef60779d339fde33c265e7c481bcfdae0 (diff) | |
| download | openembedded-1c57b57195727420a193b523f01ce87b3a0d10ae.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/unstable
Conflicts:
recipes/linux/linux-openmoko-2.6.32_git.bb
recipes/shr/libphone-ui-shr_git.bb
Diffstat (limited to 'recipes/shr')
| -rw-r--r-- | recipes/shr/libphone-ui-shr_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb index 08320fe5d2..1c0f38f3bd 100644 --- a/recipes/shr/libphone-ui-shr_git.bb +++ b/recipes/shr/libphone-ui-shr_git.bb @@ -1,8 +1,8 @@ DESCRIPTION = "SHR default module for the Phone UI daemon" SECTION = "e/apps" -DEPENDS += " dbus-glib libframeworkd-glib libphone-ui etk evas ecore edje edje-native elementary" +DEPENDS += " dbus-glib libframeworkd-glib libphone-ui evas ecore edje edje-native elementary" PV = "0.0.0+gitr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master" S = "${WORKDIR}/git" |