Changeset db71e2a in mainline for uspace/srv/hid/input/Makefile

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/hid/input/Makefile (modified) (2 diffs)

uspace/srv/hid/input/Makefile

@@ -35 +35 @@
         layout/us_qwerty.c \
         layout/us_dvorak.c \
+        layout/ar.c \
         port/adb.c \
         port/adb_mouse.c \
         port/chardev.c \
-        port/gxemul.c \
         port/msim.c \
         port/niagara.c \
@@ -47 +47 @@
         proto/mousedev.c \
         ctl/apple.c \
-        ctl/gxe_fb.c \
         ctl/kbdev.c \
         ctl/pc.c \