OSDN Git Service
(root)
/
neighbornote
/
NeighborNote.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
afc1df9
1544fb8
)
Merge remote-tracking branch 'origin/develop'
master
version0.5.3
author
yuki
<kimaira7@gmail.com>
Wed, 26 Nov 2014 01:37:30 +0000
(10:37 +0900)
committer
yuki
<kimaira7@gmail.com>
Wed, 26 Nov 2014 01:37:30 +0000
(10:37 +0900)
Conflicts:
installbuilder/installbuilder_linux.xml
installbuilder/installbuilder_mac.xml
Trivial merge
OSDN Git Service
