From: Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
Date: Fri, 17 Sep 2010 06:11:55 +0000 (+0200)
Subject: Merge branch 'master' into google
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=7d134c0f82d884194f773f8bb85ed53b1301fd7b;hp=90401aae5b2675e07ad05c8d37061915a9721bb8;p=mdictionary

Merge branch 'master' into google
---

diff --git a/mdictionary.pro b/mdictionary.pro
index d11caec..c4d2a13 100644
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -1,11 +1,11 @@
 TEMPLATE = subdirs
-SUBDIRS = src 
+SUBDIRS = src
 CONFIG += ordered
 include (mdictionary.pri)
 
 
 check.CONFIG += recursive
-check.recurse = src 
+check.recurse = src
 QMAKE_EXTRA_TARGETS += check
 
 
diff --git a/src/mdictionary/backbone/backbone.cpp b/src/mdictionary/backbone/backbone.cpp
index 0784e24..4ab57cc 100644
--- a/src/mdictionary/backbone/backbone.cpp
+++ b/src/mdictionary/backbone/backbone.cpp
@@ -65,7 +65,6 @@ public:
         QString trans;
         trans = _tr->toXml();
         return trans;
-
     }
 };