Ignore:
Timestamp:
2010-01-15T19:36:53Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
92bee46
Parents:
50f9c3a (diff), 963462af (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:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/srv/bd/part/mbr_part/Makefile.common

    r50f9c3a r61c0402  
    3131#
    3232
    33 LIBC_PREFIX = ../../../lib/libc
    34 SOFTINT_PREFIX = ../../../lib/softint
    35 LIBBLOCK_PREFIX = ../../../lib/libblock
     33LIBC_PREFIX = ../../../../lib/libc
     34SOFTINT_PREFIX = ../../../../lib/softint
     35LIBBLOCK_PREFIX = ../../../../lib/libblock
    3636LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
    3737
    3838DEPEND = Makefile.depend
    3939DEPEND_PREV = $(DEPEND).prev
     40JOB = mbr_part.job
    4041OUTPUT = mbr_part
Note: See TracChangeset for help on using the changeset viewer.