| commit | a80c086b6878ae8026265774533f47e7fd995cde | [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 | 32fd9980229a318c66e57b05c320b878abdca886 | |
| parent | 160e6ce6faa5cecc5f66695b5c05ca7033b1cd56 [diff] | |
| parent | 697cfa8c720936916270dd66d97aa13fb5993e9c [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: