Permalink
Browse files

Merge branch 'master' of github.com:jwaldrip/memory_model

Conflicts:
	README.md
  • Loading branch information...
jwaldrip committed Nov 6, 2012
2 parents e0f0e7a + 82a384d commit c3b1c1dc7053251c6b543e1e9b5392d2137915d1
Showing with 1 addition and 0 deletions.
  1. +1 −0 README.md
View
@@ -27,3 +27,4 @@ TODO: Write usage instructions here
3. Commit your changes (`git commit -am 'Add some feature'`)
4. Push to the branch (`git push origin my-new-feature`)
5. Create new Pull Request
+

0 comments on commit c3b1c1d

Please sign in to comment.