Changeset [669651fdaeba1ddae359173a0d73f5f0cd7ff152] by ignatov
Revision 669651fdaeba1ddae359173a0d73f5f0cd7ff152,
committed by ignatov
· January 29th, 2011 @ 09:49 PM
Merge remote branch 'upstream/master'
Conflicts:
Colladoc.iml
project/build/ColladocProject.scala
https://github.com/collaborative-scaladoc/colladoc/commit/669651fda...
4 changed files
-
M
Colladoc.iml -
M
Colladoc.ipr -
M
project/build/ColladocProject.scala -
M
scala