Merging remote changes

658dbc6c · Misbah Mubarak · 592f7e82 · 3e0a5bf4 · 658dbc6c · 592f7e82
Commit 658dbc6c authored Mar 22, 2016 by Misbah Mubarak
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

README.md README.md +7 -1

doc/.README.dragonfly.txt.swp doc/.README.dragonfly.txt.swp +0 -0

No files found.
--- a/README.md
+++ b/README.md
+http://www.mcs.anl.gov/projects/codes/ 

+CODES is a set of models and utilities to aid in building parallel discrete
+event simulations, on top of the ROSS simulation framework
+(https://github.com/carothersc/ROSS).
+
+Documentation can be found in the doc subdirectory.
\ No newline at end of file
--- a/doc/.README.dragonfly.txt.swp
+++ b/doc/.README.dragonfly.txt.swp