Changeset 6843a9c in mainline for uspace/srv/clipboard/Makefile


Ignore:
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:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/clipboard/Makefile

    rba72f2b r6843a9c  
    2929
    3030USPACE_PREFIX = ../..
    31 BINARY = clip
     31BINARY = clipboard
    3232
    3333SOURCES = \
    34         clip.c
     34        clipboard.c
    3535
    3636include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.