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 a1a4d9aa94 Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git ... Conflicts: source/net/yacy/cora/federate/solr/connector/MirrorSolrConnector.java		12 years ago
..
net/yacy	Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git	12 years ago
org/apache/tools/tar	- added @SuppressWarnings to unused servlet method parameters	13 years ago
log4j.properties	…