projects
/
paraslash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
42841ac
c016294
)
Merge branch 'refs/heads/t/para_play_fixes'
author
Andre Noll
<maan@tuebingen.mpg.de>
Sat, 30 Jan 2016 12:07:11 +0000
(13:07 +0100)
committer
Andre Noll
<maan@tuebingen.mpg.de>
Sat, 30 Jan 2016 12:07:11 +0000
(13:07 +0100)
Was cooking in next since 2015-10-25.
* refs/heads/t/para_play_fixes:
i9e: Avoid key binding macros.
play: Fix off-by-one in jmp 100.
1
2
play.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
play.c
Simple merge