Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 15 Jul 2011 13:58:53 +0000 (15:58 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 15 Jul 2011 13:58:53 +0000 (15:58 +0200)
commitd30758a85b647a03a1ff4d83ce4fe41b1d219167
treefc2407599b33e9e959160b603a9fc03573cfe76e
parent4b961ecd2b85ba10abcb110ffc163b5af293c0e7
parent1fc1b045b89c4122c305aa0127c06dde4dc4d0a8
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
reset .cproject
Conflicts:
.cproject
.cproject
src/pazpar2_config.c