From fb76168df6fc73528328d2fce4f10a541af92cc2 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Wed, 12 Jan 2011 15:19:38 +0100
Subject: Doc: correcting merge error

---
 doc/src/template/style/style.css | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 451d6bf..aa98af8 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -226,10 +226,15 @@
     {
         font-size: 13px;
     }
-    .red
-    {
-        color:red;
-    }
+	.red
+	{
+		color:red;
+	}
+	.figCaption{
+	color:#363534;
+	font:italic 11px/1.2 Verdana;
+	padding-top:0;
+	}
 /* end font style elements */
 
 /* global settings*/
-- 
cgit v0.12