| commit | 2c03f014817a1a1b8583cf1e296d48f7437c3dc6 | [log] [tgz] |
|---|---|---|
| author | Scott Baker <smbaker@gmail.com> | Mon Apr 25 20:28:45 2016 -0700 |
| committer | Scott Baker <smbaker@gmail.com> | Mon Apr 25 20:28:45 2016 -0700 |
| tree | 3cdaa4bab42ad49f393a1aca422f1c94008d0860 | |
| parent | 8e963e1d301faf602a99d4248b61603c324d8a33 [diff] | |
| parent | e43fa644e4612516b7acf6607093d87ff98748f7 [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: