projects / pazpar2-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15e9827 ff0f152)
Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 09:16:07 +0000 (11:16 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 09:16:07 +0000 (11:16 +0200)
1  2 
src/client.c patch | diff1 | diff2 | blob | history
win/makefile patch | diff1 | diff2 | blob | history

diff --cc src/client.c
Simple merge
diff --cc win/makefile
Simple merge
Metasearcher