Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

GHC
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8e1f5e35

Commit 8e1f5e35 authored 13 years ago by Simon Marlow

Downloads
- Patches
- Plain Diff

fix merge bugs

parent dcbfbb12

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

compiler/codeGen/CgClosure.lhs 0 additions, 6 deletions

compiler/codeGen/CgClosure.lhs
compiler/codeGen/CgPrimOp.hs 11 additions, 3 deletions

compiler/codeGen/CgPrimOp.hs
rts/Stats.c 21 additions, 19 deletions

rts/Stats.c
rts/sm/GC.c 0 additions, 2 deletions

rts/sm/GC.c
rts/sm/Storage.c 1 addition, 1 deletion

rts/sm/Storage.c

with 33 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment