Author: thorsten
Date: Wed May 19 19:00:34 2010
New Revision: 946339
URL: http://svn.apache.org/viewvc?rev=946339&view=rev
Log:
Fixing some file that should not have gone in the earlier commit svn merge
-rHEAD:946336 themer/themes/common/html/branding-logo.contract.xml
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml?rev=946339&r1=946338&r2=946339&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
Wed May 19 19:00:34 2010
@@ -67,7 +67,7 @@ xmlns:forrest="http://apache.org/forrest
<forrest:content>
<forrest:part>
<xsl:comment>+ |start Logo +</xsl:comment>
- <!-- <xsl:call-template name="renderlogo">
+ <xsl:call-template name="renderlogo">
<xsl:with-param name="name"
select="normalize-space($branding-logo-name)" />
<xsl:with-param name="url"
@@ -83,7 +83,7 @@ xmlns:forrest="http://apache.org/forrest
<xsl:with-param name="root" select="$root" />
<xsl:with-param name="description"
select="normalize-space($branding-logo-description)" />
- </xsl:call-template>-->
+ </xsl:call-template>
<xsl:comment>+ |end group Logo +</xsl:comment>
</forrest:part>
</forrest:content>
