| commit | faf81ac86a492b5e1c427f4846a202796936db4a | [log] [tgz] |
|---|---|---|
| author | Scott Baker <smbaker@gmail.com> | Thu Jun 09 22:04:51 2016 -0700 |
| committer | Scott Baker <smbaker@gmail.com> | Thu Jun 09 22:04:51 2016 -0700 |
| tree | 522d7c0c5231344823666500d043506461087f33 | |
| parent | de2a70104542e7dfb6356f44b6339e8c7ab30168 [diff] | |
| parent | 066a3010039b94c953ef2302125ff5ddff978512 [diff] |
resolve merge conflicts
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: