Changeset [193fbbef11a2e87a677cf7bdeac03960749873e3] by Alex
Revision 193fbbef11a2e87a677cf7bdeac03960749873e3,
committed by Alex
· February 16th, 2011 @ 12:15 PM
Merge remote branch 'origin/master'
Conflicts:
src/main/webapp/search.html
https://github.com/collaborative-scaladoc/colladoc/commit/193fbbef1...
5 changed files
-
A
src/main/webapp/scripts/cosearch.js -
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/snippet/SearchOps.scala -
M
src/main/webapp/search.html