Changeset 7a68fe5 in mainline for uspace/lib/c/Makefile

Timestamp:

2011-10-10T06:58:55Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (diff), 80099c19 (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 with mainline

File:

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

uspace/lib/c/Makefile

@@ -67 +67 @@
         generic/devman.c \
         generic/device/hw_res.c \
+        generic/device/hw_res_parsed.c \
         generic/device/char_dev.c \
+        generic/device/nic.c \
         generic/elf/elf_load.c \
         generic/event.c \
@@ -103 +105 @@
         generic/adt/list.c \
         generic/adt/hash_table.c \
+        generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
         generic/adt/measured_strings.c \