git.indexdata.com Git - pazpar2-moved-to-github.git/commit

projects / pazpar2-moved-to-github.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7f0b4d8 ccb49ea)

author	Adam Dickmeiss <adam@indexdata.dk>
	Wed, 12 Aug 2015 13:43:51 +0000 (15:43 +0200)
committer	Adam Dickmeiss <adam@indexdata.dk>
	Wed, 12 Aug 2015 13:43:51 +0000 (15:43 +0200)
commit	4b259026074c2fb5931eac168a64e8df0be46e30
tree	bb9bb18bebace83d7b4a30bae73c3639c3eccfea	tree \| snapshot
parent	7f0b4d88eca113e5eb0beac2046180e9ff9d08ea	commit \| diff
parent	ccb49eae33fe080c2a184b7ccf67ad32bda3e446	commit \| diff

Merge branch 'master' into paz-927

src/client.c	diff1 \|	diff2 \|	blob \| history
src/client.h	diff1 \|	diff2 \|	blob \| history
src/pazpar2_config.c	diff1 \|	diff2 \|	blob \| history
src/pazpar2_config.h	diff1 \|	diff2 \|	blob \| history
src/session.c	diff1 \|	diff2 \|	blob \| history
test/test_limit_limitmap.urls	diff1 \|	diff2 \|	blob \| history
win/makefile	diff1 \|	diff2 \|	blob \| history

Metasearcher