Merge branch 'trunk' of git@github.com:synhershko/lucene.net.git
Conflicts:
.gitignore
build/vs2010/test/Contrib.Spatial.Test.sln
src/contrib/Analyzers/Contrib.Analyzers.csproj
src/contrib/Spatial/Contrib.Spatial.csproj
src/contrib/Spatial/Properties/AssemblyInfo.cs
src/core/Lucene.Net.csproj
test/contrib/Analyzers/Contrib.Analyzers.Test.csproj
test/contrib/Spatial/Contrib.Spatial.Test.csproj
test/core/Util/LuceneTestCase.cs
test/core/Util/Paths.cs
|