projects / pazpar2-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a805ec c4d61f7)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 9 Aug 2011 10:37:21 +0000 (12:37 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 9 Aug 2011 10:37:21 +0000 (12:37 +0200)
Conflicts:
etc/tmarc.xsl

Fix or between d901 and d907 for iii-id

1  2 
etc/tmarc.xsl patch | diff1 | diff2 | blob | history

diff --cc etc/tmarc.xsl
Simple merge
Metasearcher