[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [nepomuk-core/feature/nepomuk2Includes] services/storage: Use a local include.
From:       Sebastian Trueg <trueg () kde ! org>
Date:       2012-05-16 18:57:42
Message-ID: 20120516185742.0476EA60C4 () git ! kde ! org
[Download RAW message or body]

Git commit e3e285910a90469ab2a7b79f43bc8e64030a40df by Sebastian Trueg.
Committed on 16/05/2012 at 20:53.
Pushed by trueg into branch 'feature/nepomuk2Includes'.

Use a local include.

Conflicts:

	services/storage/resourcemerger.cpp

M  +1    -1    services/storage/resourcemerger.cpp

http://commits.kde.org/nepomuk-core/e3e285910a90469ab2a7b79f43bc8e64030a40df

diff --git a/services/storage/resourcemerger.cpp b/services/storage/resourc=
emerger.cpp
index b5d97f5..33dadf7 100644
--- a/services/storage/resourcemerger.cpp
+++ b/services/storage/resourcemerger.cpp
@@ -36,7 +36,7 @@
 #include <Soprano/LiteralValue>
 #include <Soprano/Node>
 =

-#include <Nepomuk2/Vocabulary/NIE>
+#include "nie.h"
 =

 #include <KDebug>
 #include <Soprano/Graph>

[prev in list] [next in list] [prev in thread] [next in thread]