Changeset c2a6983 in mainline for uspace/lib/c/Makefile

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (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

File:

• uspace/lib/c/Makefile (modified) (3 diffs)

uspace/lib/c/Makefile

@@ -65 +65 @@
         generic/cfg.c \
         generic/clipboard.c \
+        generic/corecfg.c \
         generic/devman.c \
         generic/device/hw_res.c \
         generic/device/hw_res_parsed.c \
+        generic/device/pio_window.c \
         generic/device/char_dev.c \
         generic/device/clock_dev.c \
@@ -75 +77 @@
         generic/device/pci.c \
         generic/device/ahci.c \
+        generic/dhcp.c \
         generic/dnsr.c \
         generic/dlfcn.c \
@@ -97 +100 @@
         generic/inetcfg.c \
         generic/inetping.c \
-        generic/inetping6.c \
         generic/io/asprintf.c \
         generic/io/input.c \