Changeset ac307b2 in mainline for .gitignore


Ignore:
Timestamp:
2017-11-25T11:12:23Z (7 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
98cb5e0d
Parents:
f571ca49 (diff), 0851a3d (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 branch 'master' into callcaps

File:
1 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    rf571ca49 rac307b2  
    248248uspace/dist/logo.tga
    249249uspace/dist/srv/cdfs
     250uspace/dist/srv/chardev-test
    250251uspace/dist/srv/clipboard
    251252uspace/dist/srv/compositor
    … …  
    420421uspace/srv/ns/ns
    421422uspace/srv/taskmon/taskmon
     423uspace/srv/test/chardev-test/chardev-test
    422424uspace/srv/vfs/vfs
    423425uspace/srv/volsrv/volsrv
Note: See TracChangeset for help on using the changeset viewer.