Merge branch master into feature-shape-update
authorHelmut Grohne <grohne@cs.uni-bonn.de>
Mon, 10 Feb 2014 14:50:27 +0000 (15:50 +0100)
committerHelmut Grohne <grohne@cs.uni-bonn.de>
Mon, 10 Feb 2014 14:50:27 +0000 (15:50 +0100)
For building on the sieve example.

1  2 
Bidir.agda
FinMap.agda

diff --cc Bidir.agda
Simple merge
diff --cc FinMap.agda
Simple merge