Repositories
/
olsrd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
34a0e4a
e64d457
)
Merge branch 'release-0.6.7'
author
Ferry Huberts
<ferry.huberts@pelagic.nl>
Fri, 24 Oct 2014 07:56:58 +0000
(09:56 +0200)
committer
Ferry Huberts
<ferry.huberts@pelagic.nl>
Fri, 24 Oct 2014 07:56:58 +0000
(09:56 +0200)
* release-0.6.7:
jsoninfo: fix indentation
txtinfo: ensure null termination of string buffer
txtinfo: duplicate code in branch
Trivial merge