Changeset 6843a9c in mainline for uspace/srv/hid/input/proto/adb.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/srv/hid/input/proto/adb.c (modified) (1 diff)

uspace/srv/hid/input/proto/adb.c

@@ -82 +82 @@
         
         if (dx != 0 || dy != 0)
-                mouse_push_event_move(mouse_dev, dx, dy);
+                mouse_push_event_move(mouse_dev, dx, dy, 0);
 }