projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f795b40
fc794a5
)
Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into...
author
Dennis Schafroth
<dennis@indexdata.com>
Thu, 3 Nov 2011 14:49:38 +0000
(15:49 +0100)
committer
Dennis Schafroth
<dennis@indexdata.com>
Thu, 3 Nov 2011 14:49:38 +0000
(15:49 +0100)
Conflicts:
src/http_command.c
add active client check
Trivial merge