Revision 1393245

Jump to revision:
Author:	rmuir
Date:	Wed Oct 3 00:10:32 2012 UTC (11 years, 7 months ago)
Changed paths:	8
Log Message:	merge up to trunk

Changed paths

Path	Details
lucene/dev/branches/lucene4456/	modified , props changed
lucene/dev/branches/lucene4456/solr/	modified , props changed
lucene/dev/branches/lucene4456/solr/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene4456/solr/core/	modified , props changed
lucene/dev/branches/lucene4456/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java	modified , text changed
lucene/dev/branches/lucene4456/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java	modified , text changed
lucene/dev/branches/lucene4456/solr/solrj/	modified , props changed
lucene/dev/branches/lucene4456/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java	modified , text changed