| commit | 557e41412147712ce7f624d80ae841c31713e0bf | [log] [tgz] |
|---|---|---|
| author | Scott Baker <smbaker@gmail.com> | Tue Jun 14 10:20:45 2016 -0700 |
| committer | Scott Baker <smbaker@gmail.com> | Tue Jun 14 10:20:45 2016 -0700 |
| tree | 5ae82197a1aecb451c5cb08d64ce5f905b0c4db6 | |
| parent | 3df600a2986444ed899aa4e9d056ff212caaf94e [diff] | |
| parent | f04797ad5871c9aaeb5cc5fb2f19d4d489572153 [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: