From 3127af9feb71e62445cc6075456fa83e00405c11 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:45:17 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 main/libraries/kipi-plugins   | 2 +-
 main/libraries/libkdcraw      | 2 +-
 main/libraries/libkexiv2      | 2 +-
 main/libraries/libkipi        | 2 +-
 main/libraries/libksquirrel   | 2 +-
 main/libraries/python-trinity | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'main/libraries')

diff --git a/main/libraries/kipi-plugins b/main/libraries/kipi-plugins
index 1e229505a..cee209f8b 160000
--- a/main/libraries/kipi-plugins
+++ b/main/libraries/kipi-plugins
@@ -1 +1 @@
-Subproject commit 1e229505aba4dcd319b4e3d26cfd9ac0604d1ae5
+Subproject commit cee209f8b3fe41533e21171f62ca32c552c2d2b3
diff --git a/main/libraries/libkdcraw b/main/libraries/libkdcraw
index 81f2de707..6af58c78b 160000
--- a/main/libraries/libkdcraw
+++ b/main/libraries/libkdcraw
@@ -1 +1 @@
-Subproject commit 81f2de707a8c2964003af649a96b029d63d054ad
+Subproject commit 6af58c78b8f4d5b3ea9aacbceea8e0267d0970d2
diff --git a/main/libraries/libkexiv2 b/main/libraries/libkexiv2
index 5c2b47a6f..52020e093 160000
--- a/main/libraries/libkexiv2
+++ b/main/libraries/libkexiv2
@@ -1 +1 @@
-Subproject commit 5c2b47a6f13a968dbc875bbd1cca230aa8ca0220
+Subproject commit 52020e09319c06ed3cc35d870f47175611f2b0dc
diff --git a/main/libraries/libkipi b/main/libraries/libkipi
index a81a3f2a9..ffb2c736f 160000
--- a/main/libraries/libkipi
+++ b/main/libraries/libkipi
@@ -1 +1 @@
-Subproject commit a81a3f2a9c7ed08b8697aee2b5ebceade19c97d3
+Subproject commit ffb2c736f22dd5fc1070739b71a9d9457901cd9f
diff --git a/main/libraries/libksquirrel b/main/libraries/libksquirrel
index d89ff5f2d..b63098491 160000
--- a/main/libraries/libksquirrel
+++ b/main/libraries/libksquirrel
@@ -1 +1 @@
-Subproject commit d89ff5f2d1cd9012cf28a704f4e15c34c53e1aa1
+Subproject commit b63098491df6e7d12187f6632974d8b0fa5a7f1c
diff --git a/main/libraries/python-trinity b/main/libraries/python-trinity
index 387a27b62..a2fe88c70 160000
--- a/main/libraries/python-trinity
+++ b/main/libraries/python-trinity
@@ -1 +1 @@
-Subproject commit 387a27b62f25387e42a850739ced151d64a2e760
+Subproject commit a2fe88c70aebb03781e34c5849489ce816d6d111
-- 
cgit v1.2.1