projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bb2684
1aa3d49
)
Merge branch 'master' into paz-927
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 11 Sep 2014 12:12:58 +0000
(14:12 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 11 Sep 2014 12:12:58 +0000
(14:12 +0200)
Conflicts:
src/connection.c
1
2
win/makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
win/makefile
Simple merge