Merge branch 'tmp_draft'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Wed, 16 May 2012 04:36:19 +0000 (00:36 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Wed, 16 May 2012 04:36:19 +0000 (00:36 -0400)
commit7143b2d0ff61690b698cc8a8b0e61852ba74d984
tree555760e534303eca2e5d06dff4abb73470d2912d
parentdac1b4fc92b0581874af28f84f013b8618ec315c
parent88f22f2d17e882c55729a9bef46a3cf07b3f29d6
Merge branch 'tmp_draft'

Conflicts:
README
Makefile.draft
README
doc/build_draft.sh