projects / pazpar2-moved-to-github.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c1e90dc 950f9ae)
Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into...
authorDennis Schafroth <dennis@indexdata.com>
Thu, 3 Nov 2011 14:47:29 +0000 (15:47 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 3 Nov 2011 14:47:29 +0000 (15:47 +0100)
commitfc794a5a4623194e7e5cff1ea63ecdc80575312e
tree983ed12c4c44e4acab3bcb6bc521327ff70bc095tree | snapshot
parentc1e90dc46fdfeab556f4b9259fb671b65c114e8ccommit | diff
parent950f9ae98a1342eba4845091cc65bdfc45dd275bcommit | diff
Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into bytarget_block

Conflicts:
src/http_command.c

Added on two machines
.cproject diff1 | diff2 | blob | history
.project diff1 | diff2 | blob | history
src/http_command.c diff1 | diff2 | blob | history
Metasearcher