| commit | 2c3179ae5a97a45f556b783e4b3411e464b56045 | [log] [tgz] |
|---|---|---|
| author | arpiagariu <arpiagariu@gmail.com> | Mon Jun 06 15:39:06 2016 -0700 |
| committer | arpiagariu <arpiagariu@gmail.com> | Mon Jun 06 15:39:06 2016 -0700 |
| tree | 8781e417ff2a242d6cc128ce1484981a8f2f3344 | |
| parent | acdf84676763ce58f6a90e03e8172c3342216586 [diff] | |
| parent | c00865dbf38a7149b2086cdaa51d2e4654c7bb5c [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: