]> git.unchartedbackwaters.co.uk Git - francis/ofc.git/commit
Merge branch 'master' into haskell
authorFrancis Russell <francis@unchartedbackwaters.co.uk>
Fri, 14 Sep 2012 13:53:34 +0000 (14:53 +0100)
committerFrancis Russell <francis@unchartedbackwaters.co.uk>
Fri, 14 Sep 2012 13:53:34 +0000 (14:53 +0100)
commit1339a794579f0445d0207082a5bbbc8c0bd4efb9
treef4c1423531344ec10be4483c09ff3ca8fd4de555
parente3d4f0a3eaf19a9b51301db39f66a5ff83ad6357
parent80cedfcd6d7be70f2690be424dc5b4ab76ee93f2
Merge branch 'master' into haskell

Conflicts:
examples/integrals_pos.ofl