Changeset [05402cd6f61aa2ab4898833385e1b01f8497ca99] by Petr Hosek
Revision 05402cd6f61aa2ab4898833385e1b01f8497ca99,
committed by Petr Hosek
· January 21st, 2012 @ 05:45 PM
Merged local changes
https://github.com/colladoc/colladoc/commit/05402cd6f61aa2ab4898833...
13 changed files
-
A
.idea/codeStyleSettings.xml -
A
.idea/highlighting.xml -
A
.idea/scopes/scope_settings.xml -
A
project/build.sbt -
R
project/plugins/build.sbt -
M
.idea/modules.xml -
M
build.sbt -
M
scala -
M
src/main/scala/scala/tools/colladoc/model/SearchIndex.scala -
M
src/test/scala/scala/tools/colladoc/integration/SearchEndToEndTests.scala -
M
src/test/scala/scala/tools/colladoc/model/DocTemplateEntityMock.scala -
M
src/test/scala/scala/tools/colladoc/model/EntityMemberMock.scala -
M
src/test/scala/scala/tools/colladoc/model/SearchIndexTests.scala