projects / chise / kage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c032754 2d3e1d1)
Merge remote-tracking branch 'origin/master'
authorKoichi Kamichi <kamichi@ic.daito.ac.jp>
Mon, 11 Jan 2016 15:43:30 +0000 (00:43 +0900)
committerKoichi Kamichi <kamichi@ic.daito.ac.jp>
Mon, 11 Jan 2016 15:43:30 +0000 (00:43 +0900)

Trivial merge