From d26187345ce6fb1370139b8bac75eebcf5d082d7 Mon Sep 17 00:00:00 2001
From: Siraj Razick <siraj.razick@collabora.co.uk>
Date: Thu, 16 Feb 2012 13:46:37 -0500
Subject: salut-connection: Merge src/connection.h and salut/connection.h

SalutConnection is not used by plugins anymore so this patch merges
src/connection.h and salut/connection.h into a single file.
---
 src/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index d4f3e12c..1f501b3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,7 +88,6 @@ CORE_SOURCES =                                          \
     plugin-loader.h                                     \
     $(top_srcdir)/salut/plugin.h                        \
     plugin.c						\
-    $(top_srcdir)/salut/connection.h			\
     $(top_srcdir)/salut/sidecar.h			\
     $(top_srcdir)/salut/plugin-connection.h             \
     plugin-connection.c                                 \
-- 
cgit v1.2.1