uinput,mesa: fix merge
authorMartin Jansa <Martin.Jansa@gmail.com>
Mon, 12 Apr 2010 16:14:52 +0000 (18:14 +0200)
committerMartin Jansa <Martin.Jansa@gmail.com>
Mon, 12 Apr 2010 16:14:52 +0000 (18:14 +0200)
commitc6d01532bf022188091cdf6f58350e6312a05176
tree40c583eb5db1c4d0af1474263544c68773a19c02
parent8195be90301213d5a9c65d511e301e611903bc2c
uinput,mesa: fix merge
recipes/mamona/uinput_2.6.21.bb
recipes/mesa/mesa-full_7.0.2.bb