| commit | 0b866fc9135345f3c27172757714ac4804afaa47 | [log] [tgz] |
|---|---|---|
| author | Scott Baker <smbaker@gmail.com> | Mon Apr 25 10:24:16 2016 -0700 |
| committer | Scott Baker <smbaker@gmail.com> | Mon Apr 25 10:24:16 2016 -0700 |
| tree | 6495cd3120ad7d19d0a2acdaa25da03fc2c783a9 | |
| parent | 1c390215fc3176ffa0a5b0b663688a862bfc8b19 [diff] | |
| parent | f698cbe8375add9b2f0d3f8d871b477de4d943b5 [diff] |
fix 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: