Changeset [b40d7c9cbf080671af8edf8efd5fce659fa0e1c9] by Alex

February 25th, 2011 @ 02:43 PM

Merge branch 'master' of git+ssh://gituser.doc.ic.ac.uk/vol/project/2010/530/g1053008/source/colladoc

Conflicts:

src/main/scala/scala/tools/colladoc/snippet/SearchOps.scala

https://github.com/collaborative-scaladoc/colladoc/commit/b40d7c9cb...

Committed by Alex

  • A lib/lucene-analyzers-common-4.0-SNAPSHOT.jar
  • A lib/lucene-core-4.0-SNAPSHOT.jar
  • A lib/lucene-with-paging.jar
  • A src/main/scala/scala/tools/colladoc/utils/Timer.scala
  • A src/test/scala/LuceneRegressionTests.scala
  • A src/test/scala/ParserAndLuceneTests.scala
  • M project/build/ColladocProject.scala
  • M scripts/setdefaultprops.sh
  • M src/main/scala/scala/tools/colladoc/lib/DependencyFactory.scala
  • M src/main/scala/scala/tools/colladoc/model/SearchIndex.scala
  • M src/main/scala/scala/tools/colladoc/page/Template.scala
  • M src/main/scala/scala/tools/colladoc/search/LuceneQuery.scala
  • M src/main/scala/scala/tools/colladoc/search/ScoogleParser.scala
  • M src/main/scala/scala/tools/colladoc/search/SearchQuery.scala
  • M src/main/scala/scala/tools/colladoc/snippet/SearchOps.scala
  • M src/test/scala/RunParserTests.scala
  • M src/test/scala/scala/tools/colladoc/model/EntityMemberMock.scala
  • M src/test/scala/scala/tools/colladoc/model/SearchIndexTests.scala
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Web application allowing to edit Scala symbols documentation.

Shared Ticket Bins