You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Michael Peter Christen 14cceb6b17 Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git ... Conflicts: htroot/IndexFederated_p.html source/net/yacy/cora/federate/solr/YaCySchema.java source/net/yacy/peers/Protocol.java source/net/yacy/search/Switchboard.java source/net/yacy/search/index/Segment.java also moved portalsearch-dev to yacy-portalsearch to be able to fix problems with new attachment to solr of the search widget		12 years ago
..
CollectionConfiguration.java	…
CollectionSchema.java	…
WebgraphConfiguration.java	…
WebgraphSchema.java	…