projects / pazpar2-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e50eff fc88d4e)
Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 22 Mar 2013 11:52:08 +0000 (12:52 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 22 Mar 2013 11:52:08 +0000 (12:52 +0100)
1  2 
src/client.c patch | diff1 | diff2 | blob | history
src/session.c patch | diff1 | diff2 | blob | history

diff --cc src/client.c
Simple merge
diff --cc src/session.c
Simple merge
Metasearcher