| commit | 8dc94a87e6176f45bec4d08ca57cd6aedb1c15e7 | [log] [tgz] |
|---|---|---|
| author | Andy Bavier <acb@cs.princeton.edu> | Wed Jun 15 14:31:39 2016 -0700 |
| committer | GitHub <noreply@github.com> | Wed Jun 15 14:31:39 2016 -0700 |
| tree | abc10a75e022510790c4c46d864d7a975c0916c8 | |
| parent | e50e427377495cd05cebf9d11fdde1a6d48e0d20 [diff] |
Remove artifact of 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: