OSDN Git Service
(root)
/
modchxj
/
mod_chxj.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c644216
6c30536
)
Merge branch 'branch_0.12.0'
author
Atsushi Konno
<atkonn@gmail.com>
Tue, 6 Oct 2009 16:50:51 +0000
(
01:50
+0900)
committer
Atsushi Konno
<atkonn@gmail.com>
Tue, 6 Oct 2009 16:50:51 +0000
(
01:50
+0900)
Conflicts:
configure
configure.ac
include/config.h
support/centos/mod-chxj.spec
Trivial merge