diff options
| author | Helmut Grohne <grohne@cs.uni-bonn.de> | 2014-02-04 10:32:34 +0100 |
|---|---|---|
| committer | Helmut Grohne <grohne@cs.uni-bonn.de> | 2014-02-04 10:32:34 +0100 |
| commit | 257665f2910296c6e87113d2f7a418e1f83b33f6 (patch) | |
| tree | 5f179250edf342f351d679f263c22d97d6496811 /Generic.agda | |
| parent | e227314c11a17efa2e41ee8756041c4e5b747792 (diff) | |
| parent | 6eff9c9c93e942ac4bf39cd6d62c0ae0d601c1ae (diff) | |
| download | bidiragda-257665f2910296c6e87113d2f7a418e1f83b33f6.tar.gz | |
Merge branch feature-get-record into feature-partial-getlen
These two features heavily interconnect. As such it makes sense to
integrate them properly. This non-trivial merge does that work. Compared
to feature-partial-getlen a few definitions moved from FreeTheorems.agda
to GetTypes.agda. Many types changed compared to both branches.
Conflicts:
BFF.agda
Bidir.agda
FreeTheorems.agda
Precond.agda
conflict in GetTypes.agda not detected by merge
Diffstat (limited to 'Generic.agda')
0 files changed, 0 insertions, 0 deletions