Changeset [365e2b7b8f86c97bdfb0eb45f87477e6d12bbe4d] by rumyana neykova
February 25th, 2011 @ 02:32 AM
Merge branch 'master' of git+ssh://gituser.doc.ic.ac.uk/vol/project/2010/530/g1053008/source/colladoc
Conflicts:
src/test/scala/scala/tools/colladoc/model/SearchIndexTests.scala
https://github.com/collaborative-scaladoc/colladoc/commit/365e2b7b8...
Committed by rumyana neykova
- A src/main/scala/scala/tools/colladoc/utils/Timer.scala
- M Colladoc.ipr
- 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/Search.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/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
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.