diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-04-12 18:14:52 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-04-12 18:14:52 +0200 |
| commit | c6d01532bf022188091cdf6f58350e6312a05176 (patch) | |
| tree | 40c583eb5db1c4d0af1474263544c68773a19c02 /recipes/mesa | |
| parent | 8195be90301213d5a9c65d511e301e611903bc2c (diff) | |
uinput,mesa: fix merge
Diffstat (limited to 'recipes/mesa')
| -rw-r--r-- | recipes/mesa/mesa-full_7.0.2.bb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/recipes/mesa/mesa-full_7.0.2.bb b/recipes/mesa/mesa-full_7.0.2.bb index f552a21dd5..2e0b8b6e67 100644 --- a/recipes/mesa/mesa-full_7.0.2.bb +++ b/recipes/mesa/mesa-full_7.0.2.bb @@ -18,8 +18,6 @@ PACKAGES =+ "libglut libglut-dev mesa-utils" FILES_libglut = "${libdir}/libglut.so.*" FILES_libglut-dev = "${libdir}/libglut.* ${includedir}/GL/glut*" FILES_mesa-utils = "${bindir}/*" -<<<<<<< HEAD -======= SRC_URI[archive.md5sum] = "93e6ed7924ff069a4f883b4fce5349dc" SRC_URI[archive.sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e" @@ -27,4 +25,3 @@ SRC_URI[glut.md5sum] = "3a33f8efc8c58a592a854cfc7a643286" SRC_URI[glut.sha256sum] = "fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c" SRC_URI[demos.md5sum] = "11a10410bae7be85cf25bc7119966468" SRC_URI[demos.sha256sum] = "ce39b26085acd8e5dffa8233618acac2605cc42203bc4f81c6e4504265f0ffaa" ->>>>>>> b6d0763... recipes: add missing checksums |