Permalink
Browse files

Merge pull request #5 from romac/master

Here it is. Burp.
  • Loading branch information...
2 parents cd99609 + 990af93 commit 420a1d1b42aa29b80040e70e32fa76e24a330781 Amos Wenger committed Jan 24, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 README.md
View
@@ -1,4 +1,3 @@
-
# the ooc language
## status
@@ -21,4 +20,11 @@ Then,
$ make publish
-will switch to the `gh-pages` branch, commit the modifications and push the commits to `origin` (which may be your forked repository).
+will switch to the `gh-pages` branch, commit the modifications and push the commits to `origin` (which may be your forked repository).
+
+## todo
+
+1. Figure out how to order the sections.
+2. Merge branch ['mdoc'](https://github.com/romac/the-ooc-language/tree/mdoc) into 'master' in a way that will let us generate both versions of the documentation with a single Makefile.
+3. ...
+4. Profit !

0 comments on commit 420a1d1

Please sign in to comment.