| commit | 378cb2e88c2bfc1f739e83d8ddf4d3ea644d95cb | [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 | b34abaf80d6ec517e1d6898a48043011a0f7568d | |
| parent | ddc23a0d167c1947bd90dd785d244cef45791f33 [diff] | |
| parent | 314e7e13f943ea1a84851f7cea34dbb125d936d0 [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: