Changeset c42f50d in mainline for uspace/Makefile


Ignore:
Timestamp:
2013-10-05T11:53:43Z (12 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cbfc8b7
Parents:
408424e (diff), 3e896e1 (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 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r408424e rc42f50d  
    7676        app/nettest3 \
    7777        app/ping \
    78         app/ping6 \
    7978        app/sysinfo \
    8079        app/mkbd \
    8180        app/date \
    8281        app/vdemo \
     82        app/viewer \
    8383        app/vlaunch \
    8484        app/vterm \
    … …  
    9797        srv/net/inetsrv \
    9898        srv/net/loopip \
     99        srv/net/nconfsrv \
    99100        srv/net/slip \
    100101        srv/net/tcp \
Note: See TracChangeset for help on using the changeset viewer.