diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
| commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
| tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/networkmanager/networkmanager_0.7olpc.bb | |
| parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
| parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
| download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/networkmanager/networkmanager_0.7olpc.bb')
| -rw-r--r-- | recipes/networkmanager/networkmanager_0.7olpc.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/networkmanager/networkmanager_0.7olpc.bb b/recipes/networkmanager/networkmanager_0.7olpc.bb index 230360168d..16cf9c52f2 100644 --- a/recipes/networkmanager/networkmanager_0.7olpc.bb +++ b/recipes/networkmanager/networkmanager_0.7olpc.bb @@ -6,6 +6,6 @@ PV = "0.7olpc+git" DEFAULT_PREFERENCE = "-1" SRC_URI += "git://dev.laptop.org/users/sjoerd/NetworkManager.git;protocol=git;branch=olpc-patches;tag=f1fa6c27710196b7327402c59b2c55d920a12bb0 \ - file://define_kernel_types_for_old_linux_headers_and_warn_functions_from_glib_2_16.patch;patch=1 \ + file://define_kernel_types_for_old_linux_headers_and_warn_functions_from_glib_2_16.patch \ " S = "${WORKDIR}/git" |