projects
/
jansson.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
8b2bfd5
ff6e6ee
)
Merge branch '2.3'
author
Petri Lehtinen
<petri@digip.org>
Fri, 20 Apr 2012 18:41:25 +0000
(21:41 +0300)
committer
Petri Lehtinen
<petri@digip.org>
Fri, 20 Apr 2012 18:41:25 +0000
(21:41 +0300)
Conflicts:
configure.ac
doc/conf.py
src/jansson.h
Trivial merge