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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: fbdba02 221b381)

author	Dennis Schafroth <dennis@indexdata.com>
	Tue, 15 Nov 2011 10:27:02 +0000 (11:27 +0100)
committer	Dennis Schafroth <dennis@indexdata.com>
	Tue, 15 Nov 2011 10:27:02 +0000 (11:27 +0100)
commit	ee0c5796c67648c25249bf34c035d512f98e87b4
tree	a453e63f9f1c32601967109419b102ac5f2eea30	tree \| snapshot
parent	fbdba021c917c36b27a594bfa555de45d4f2383c	commit \| diff
parent	221b381d5097d0999b5b91843d55de76d45693d0	commit \| diff

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
www/iphone/example_client.js

Fix: added md-author in branch. Added recIDs on head.

.cproject	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
www/iphone/example_client.js	diff1 \|	diff2 \|	blob \| history

Metasearcher