Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Mon, 28 Mar 2011 00:20:22 +0000 (17:20 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Mon, 28 Mar 2011 00:20:22 +0000 (17:20 -0700)
Conflicts:
src/Extraction-prefix.hs


No differences found