| commit | c0ffe0cd85ae6cfa18a6992356793073dd151382 | [log] [tgz] |
|---|---|---|
| author | Scott Baker <smbaker@gmail.com> | Wed Jun 15 16:56:54 2016 -0700 |
| committer | Scott Baker <smbaker@gmail.com> | Wed Jun 15 16:56:54 2016 -0700 |
| tree | 116eb257da4889e324a0daed0df1d51894c6a225 | |
| parent | 85aef7720faadf07bca8d126d02644d8ceed69f5 [diff] | |
| parent | 3488364a0f449a63e2f93af4b877b6299e748d29 [diff] |
resolve merge conflict
For a general introduction to XOS and how it is used in CORD, see http://guide.xosproject.org. The "Developer Guide" at that URL is especially helpful, although it isn't perfectly sync'ed with master. Additional design notes, presentations, and other collateral are also available at http://xosproject.org and http://opencord.org.
The best way to get started is to look at the collection of canned configurations in xos/configurations/. The cord configuration in that directory corresponds to our current CORD development environment, and the README.md you'll find there will help you get started.
Source tree layout: