OSDN Git Service
(root)
/
hengband
/
hengband.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
97c5ab0
d7a79e5
)
Merge branch 'master' of git.sourceforge.jp:/gitroot/hengband/hengband
author
Deskull
<desull@users.sourceforge.jp>
Wed, 12 Jul 2017 12:49:49 +0000
(21:49 +0900)
committer
Deskull
<desull@users.sourceforge.jp>
Wed, 12 Jul 2017 12:49:49 +0000
(21:49 +0900)
# Conflicts:
# lib/edit/a_info.txt
Trivial merge