Changeset 6843a9c in mainline for uspace/srv/hid/input/Makefile

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/Makefile (modified) (2 diffs)

uspace/srv/hid/input/Makefile

@@ -43 +43 @@
         port/adb_mouse.c \
         port/chardev.c \
-        port/chardev_mouse.c \
         port/gxemul.c \
         port/msim.c \
@@ -52 +51 @@
         proto/adb.c \
         proto/mousedev.c \
-        proto/ps2.c \
         ctl/apple.c \
         ctl/gxe_fb.c \