projects
/
cubicaltt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d5d1c9d
6cf058d
)
Merge branch 'hisoproj' into no_regular
author
Simon Huber
<hubsim@gmail.com>
Fri, 5 Jun 2015 13:56:59 +0000
(15:56 +0200)
committer
Simon Huber
<hubsim@gmail.com>
Fri, 5 Jun 2015 13:56:59 +0000
(15:56 +0200)
Conflicts:
Eval.hs
1
2
Eval.hs
patch
|
diff1
|
diff2
|
blob
|
history
examples/prelude.ctt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Eval.hs
Simple merge
diff --cc
examples/prelude.ctt
Simple merge
projects / cubicaltt.git / commitdiff